This is an automated email from the git hooks/post-receive script. polyzen pushed a change to branch master in repository pacman-contrib. from e092561 pacdiff: Reindent awk script new b675c92 pacdiff: Implement die() new 348a296 pacdiff: Reduce repetition in input loop new 94b2a19 pacdiff: Learn the (M)erge mode The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Graph of new commits: * 94b2a19 (HEAD -> master) pacdiff: Learn the (M)erge mode * 348a296 pacdiff: Reduce repetition in input loop * b675c92 pacdiff: Implement die() Detailed log of new commits: commit 94b2a194b484441cc555aa069496a40ebb9f97f3 Author: Denton Liu via pacman-contrib <pacman-contrib@lists.archlinux.org> Date: Thu Mar 4 03:55:47 2021 -0800 pacdiff: Learn the (M)erge mode Currently, pacdiff only allows users to diff between the current file and the new file. However, the merging of files could be automated by the use of some 3-way merge utility. Teach pacdiff the (M)erge mode which performs a 3-way merge using a given $MERGEPROG (`diff3 -m` by default). The base file is taken from from the second-newest package in the cache. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> commit 348a29696c41f07b693e29aab9264d1d8d6c17f8 Author: Denton Liu via pacman-contrib <pacman-contrib@lists.archlinux.org> Date: Thu Mar 4 03:55:46 2021 -0800 pacdiff: Reduce repetition in input loop The input loop repeats the `ask` code twice. In a future commit, we will be introducing another instance of the `ask` code. This makes it possible to mistakenly make the code to get out of sync. Refactor the loop so that the `ask` code happens once at the top of the loop. This introduces one functional change in the "Invalid answer" case but it also makes it more consistent with the remaining cases. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> commit b675c9272240bdb1505d528fc6f1bcc0f673fac9 Author: Denton Liu via pacman-contrib <pacman-contrib@lists.archlinux.org> Date: Thu Mar 4 03:55:45 2021 -0800 pacdiff: Implement die() In a future commit, we will be making more use of this function. For now, implement it and use it in the one place where it's applicable. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Daniel M. Capella <polyzen@archlinux.org> Summary of changes: doc/pacdiff.8.txt | 9 +++-- src/pacdiff.sh.in | 100 ++++++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 96 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.