# HG changeset patch # User Pierre-Yves David # Date 1507668041 -7200 # Node ID cb8ae3cb0bbc3fd830df589b1618834b91794c7b # Parent 774b4ea6ca584c912a9f8775851a86280d907024# Parent 9360d7ad727073a7ce3de89933adc6967bb22d69 branching: merge with stable diff -r 774b4ea6ca58 -r cb8ae3cb0bbc .hgtags --- a/.hgtags Mon Oct 09 19:39:13 2017 +0530 +++ b/.hgtags Tue Oct 10 22:40:41 2017 +0200 @@ -57,3 +57,4 @@ 734c0bc066cdc0121a20a9cb44c8cc30c653be94 6.5.0 cc3e09e033a3c632c9ac35badbf8b5d53f584049 6.6.0 3a4f75c6619c7ef7d78ee0912efd6cb01d55b521 6.7.0 +430ad68292d76b9387d1eeadf289951f51fd88d3 6.7.1 diff -r 774b4ea6ca58 -r cb8ae3cb0bbc CHANGELOG --- a/CHANGELOG Mon Oct 09 19:39:13 2017 +0530 +++ b/CHANGELOG Tue Oct 10 22:40:41 2017 +0200 @@ -1,10 +1,16 @@ Changelog ========= -6.7.1 - in progress +6.7.1 -- 2017-10-10 ------------------- - * stack: fix evolution previous for simple split + * obsfate: fix case were current user would disapear from the user list + +topic (0.3.1) + + * stack: fix evolution preview for simple split. + * fix a performance regression affecting all transactions. + (the more non public changeset (hidden included), the slower) 6.7.0 -- 2017-09-27 ------------------- @@ -16,6 +22,8 @@ * pstatus/pdiff: update to full command. They now appears in the help, * uncommit: add a --interactive option (4.3+ only). +topic (0.3.0) + * push: add a --topic option to mirror --bookmark and --branch, * stack: improve display of interleaved topic, * stack: improve display of merge commit, diff -r 774b4ea6ca58 -r cb8ae3cb0bbc README diff -r 774b4ea6ca58 -r cb8ae3cb0bbc debian/changelog --- a/debian/changelog Mon Oct 09 19:39:13 2017 +0530 +++ b/debian/changelog Tue Oct 10 22:40:41 2017 +0200 @@ -1,4 +1,10 @@ -mercurial-evolve (6.7.0-1) UNRELEASED; urgency=medium +mercurial-evolve (6.7.1-1) unstable; urgency=medium + + * new upstream release + + -- Pierre-Yves David Tue, 10 Oct 2017 16:03:23 +0200 + +mercurial-evolve (6.7.0-1) unstable; urgency=medium * new upstream release diff -r 774b4ea6ca58 -r cb8ae3cb0bbc hgext3rd/evolve/metadata.py diff -r 774b4ea6ca58 -r cb8ae3cb0bbc hgext3rd/evolve/templatekw.py --- a/hgext3rd/evolve/templatekw.py Mon Oct 09 19:39:13 2017 +0530 +++ b/hgext3rd/evolve/templatekw.py Tue Oct 10 22:40:41 2017 +0200 @@ -202,12 +202,15 @@ if (verbose or normal) and 'users' in obsfateline: users = obsfateline['users'] - if normal: + if not verbose: + # If current user is the only user, do not show anything if not in + # verbose mode username = _getusername(ui) - users = [user for user in users if user != username] + if len(users) == 1 and users[0] == username: + users = None if users: - line.append(" by %s" % ",".join(users)) + line.append(" by %s" % ", ".join(users)) # Date if verbose: diff -r 774b4ea6ca58 -r cb8ae3cb0bbc hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Mon Oct 09 19:39:13 2017 +0530 +++ b/hgext3rd/topic/__init__.py Tue Oct 10 22:40:41 2017 +0200 @@ -139,6 +139,7 @@ } __version__ = '0.4.0.dev' + testedwith = '4.0.2 4.1.3 4.2.3 4.3.3' minimumhgversion = '4.0' buglink = 'https://bz.mercurial-scm.org/' @@ -338,14 +339,14 @@ ct = self.currenttopic if not ct: return tr - ctwasempty = stack.stackdata(self, topic=ct)['changesetcount'] == 0 + ctwasempty = stack.stack(self, topic=ct).changesetcount == 0 reporef = weakref.ref(self) def currenttopicempty(tr): # check active topic emptyness repo = reporef() - csetcount = stack.stackdata(repo, topic=ct)['changesetcount'] + csetcount = stack.stack(repo, topic=ct).changesetcount empty = csetcount == 0 if empty and not ctwasempty: ui.status('active topic %r is now empty\n' % ct) @@ -496,7 +497,7 @@ ct = repo.currenttopic if clear: - empty = stack.stackdata(repo, topic=ct)['changesetcount'] == 0 + empty = stack.stack(repo, topic=ct).changesetcount == 0 if empty: if ct: ui.status(_('clearing empty topic "%s"\n') % ct) @@ -994,7 +995,7 @@ # rebased commit. We have explicitly stored in config if rebase is # running. ot = repo.currenttopic - empty = stack.stackdata(repo, topic=ot)['changesetcount'] == 0 + empty = stack.stack(repo, topic=ot).changesetcount == 0 if repo.ui.hasconfig('experimental', 'topicrebase'): isrebase = True if repo.ui.configbool('_internal', 'keep-topic'): diff -r 774b4ea6ca58 -r cb8ae3cb0bbc hgext3rd/topic/stack.py --- a/hgext3rd/topic/stack.py Mon Oct 09 19:39:13 2017 +0530 +++ b/hgext3rd/topic/stack.py Tue Oct 10 22:40:41 2017 +0200 @@ -34,9 +34,9 @@ if topic is not None and branch is not None: raise error.ProgrammingError('both branch and topic specified (not defined yet)') elif topic is not None: - trevs = repo.revs("topic(%s) - obsolete()", topic) + trevs = repo.revs("not obsolete() and topic(%s) - obsolete()", topic) elif branch is not None: - trevs = repo.revs("branch(%s) - public() - obsolete() - topic()", branch) + trevs = repo.revs("not public() and branch(%s) - obsolete() - topic()", branch) else: raise error.ProgrammingError('neither branch and topic specified (not defined yet)') self._revs = trevs diff -r 774b4ea6ca58 -r cb8ae3cb0bbc tests/test-evolve-templates.t --- a/tests/test-evolve-templates.t Mon Oct 09 19:39:13 2017 +0530 +++ b/tests/test-evolve-templates.t Tue Oct 10 22:40:41 2017 +0200 @@ -33,7 +33,7 @@ $ mkcommit ROOT $ mkcommit A0 $ echo 42 >> A0 - $ HGUSER=test1 hg amend -m "A1" --config devel.default-date="1234567890 0" + $ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0" $ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0" $ hg log --hidden -G @ changeset: 3:d004c8f274b9 @@ -53,7 +53,7 @@ | x changeset: 1:471f378eab4c |/ user: test | date: Thu Jan 01 00:00:00 1970 +0000 - | obsolete: rewritten as a468dc9b3633 by test1 + | obsolete: rewritten as a468dc9b3633 | summary: A0 | o changeset: 0:ea207398892e @@ -76,7 +76,7 @@ | rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000) | @ 471f378eab4c (1) A0 - rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000) + rewritten(description, content) as a468dc9b3633 by test (Fri Feb 13 23:31:30 2009 +0000) $ hg tlog o d004c8f274b9 @@ -85,10 +85,31 @@ | @ 471f378eab4c |/ Successors: [d004c8f274b9] | semi-colon: [d004c8f274b9] - | Fate: rewritten as d004c8f274b9 by test1, test2 + | Fate: rewritten as d004c8f274b9 by test, test2 | o ea207398892e + + $ hg log -G + o changeset: 3:d004c8f274b9 + | tag: tip + | parent: 0:ea207398892e + | user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | summary: A2 + | + | @ changeset: 1:471f378eab4c + |/ user: test + | date: Thu Jan 01 00:00:00 1970 +0000 + | obsolete: rewritten as d004c8f274b9 by test, test2 + | summary: A0 + | + o changeset: 0:ea207398892e + user: test + date: Thu Jan 01 00:00:00 1970 +0000 + summary: ROOT + + $ hg fatelog -q o d004c8f274b9 | @@ -102,7 +123,7 @@ o d004c8f274b9 | | @ 471f378eab4c - |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 + |/ Obsfate: rewritten as d004c8f274b9 by test, test2 | o ea207398892e @@ -110,7 +131,7 @@ o d004c8f274b9 | | @ 471f378eab4c - |/ Obsfate: rewritten as d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten as d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000) | o ea207398892e @@ -166,7 +187,7 @@ | x 471f378eab4c |/ Successors: [a468dc9b3633] | semi-colon: [a468dc9b3633] - | Fate: rewritten as a468dc9b3633 by test1 + | Fate: rewritten as a468dc9b3633 | o ea207398892e @@ -199,7 +220,7 @@ | x 471f378eab4c |/ Successors: [a468dc9b3633] | semi-colon: [a468dc9b3633] - | Fate: rewritten as a468dc9b3633 by test1 + | Fate: rewritten as a468dc9b3633 | o ea207398892e @@ -216,7 +237,7 @@ |/ Obsfate: reworded as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000) | | x 471f378eab4c - |/ Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000) + |/ Obsfate: rewritten as a468dc9b3633 by test (at 2009-02-13 23:31 +0000) | o ea207398892e @@ -226,7 +247,7 @@ | | x a468dc9b3633 [{"markers": [["a468dc9b36338b14fdb7825f55ce3df4e71517ad", ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test2"]], [987654321.0, 0], null]], "max_date": [987654321.0, 0], "min_date": [987654321.0, 0], "successors": ["d004c8f274b9ec480a47a93c10dac5eee63adb78"], "users": ["test2"], "verb": "reworded"}] |/ - | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test1"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test1"], "verb": "rewritten"}] + | x 471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], 0, [["ef1", "9"], ["operation", "amend"], ["user", "test"]], [1234567890.0, 0], null]], "max_date": [1234567890.0, 0], "min_date": [1234567890.0, 0], "successors": ["a468dc9b36338b14fdb7825f55ce3df4e71517ad"], "users": ["test"], "verb": "rewritten"}] |/ o ea207398892e ""