Submitter | phabricator |
---|---|
Date | May 11, 2019, 7:18 a.m. |
Message ID | <differential-rev-PHID-DREV-4psckubaqv4wtltemabs-req@phab.mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/40008/ |
State | Superseded |
Headers | show |
Comments
pulkit added inline comments. INLINE COMMENTS > context.py:469 > + modified.difference_update(self.filesadded()) > + modified.difference_update(self.filesremoved()) > return sorted(modified) This change should be part of previous patch right? (I can fold that in previous change in flight) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6368 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel
martinvonz added inline comments. INLINE COMMENTS > pulkit wrote in context.py:469 > This change should be part of previous patch right? (I can fold that in previous change in flight) Yes, thanks for noticing and fixing. I fixed it in my repo, but I must have forgotten to update it here. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D6368 To: martinvonz, #hg-reviewers Cc: pulkit, mercurial-devel
Patch
diff --git a/tests/test-template-keywords.t b/tests/test-template-keywords.t --- a/tests/test-template-keywords.t +++ b/tests/test-template-keywords.t @@ -798,6 +798,23 @@ fourth third +Test files lists on merge commit: + + $ hg co '.^' -q + $ touch c + $ hg add c + $ hg ci -qm 'add file' + $ hg merge 10 -q + $ hg ci -m 'merge' + $ hg log -l1 -T '{files}\n' + a fourth + $ hg log -l1 -T '{file_mods}\n' + third + $ hg log -l1 -T '{file_adds}\n' + b fifth + $ hg log -l1 -T '{file_dels}\n' + a fourth + Test file copies dict: $ hg log -r8 -T '{join(file_copies, " ")}\n' @@ -818,7 +835,7 @@ Test file attributes: - $ hg log -l1 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}' + $ hg log -r10 -T '{files % "{status} {pad(size, 3, left=True)} {path}\n"}' R a A 0 b A 7 fifth @@ -834,7 +851,7 @@ Test index keyword: - $ hg log -l 2 -T '{index + 10}{files % " {index}:{file}"}\n' + $ hg log -r 10:9 -T '{index + 10}{files % " {index}:{file}"}\n' 10 0:a 1:b 2:fifth 3:fourth 4:third 11 0:a