Sun, 24 Aug 2008 22:13:39 +0200 Backed out changeset d557749c627a stable
Patrick Mezard <pmezard@gmail.com> [Sun, 24 Aug 2008 22:13:39 +0200] rev 490
Backed out changeset d557749c627a Replace this change with a better one. [ original upstream description ]
Sun, 24 Aug 2008 20:13:45 +0200 (0.9.2compat) remove new verbose commit message for backwards compatibility 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:13:45 +0200] rev 489
(0.9.2compat) remove new verbose commit message for backwards compatibility
Sun, 24 Aug 2008 20:02:02 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Sun, 24 Aug 2008 20:02:02 +0200] rev 488
(stable) merge with default
Fri, 22 Aug 2008 13:25:35 +0200 Have verbose flag print the changeset hash when committing stable
Gilles Moris <gilles.moris@free.fr> [Fri, 22 Aug 2008 13:25:35 +0200] rev 487
Have verbose flag print the changeset hash when committing [ original upstream message ]
Fri, 22 Aug 2008 11:53:30 +0200 (0.9.2compat) add merge, resolve to restricted 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 11:53:30 +0200] rev 486
(0.9.2compat) add merge, resolve to restricted This is not really backwards compatible (test only as comment) and doesn't prevent extra conflicts with older Hg versions. On the other hand it doesn't do any damage either and provides the 3-way merge ease if possible.
Fri, 22 Aug 2008 08:26:18 +0200 Avoid additional conflicts during merge/resolve
Christian Ebert <blacktrash@gmx.net> [Fri, 22 Aug 2008 08:26:18 +0200] rev 485
Avoid additional conflicts during merge/resolve Make merge and resolve trigger kwtemplater.restricted to compare data without keyword expansion. The keyword stays outside the conflict: $Keyword$ <<<<<<< local bar ======= foo >>>>>>> other and will again be expanded on commit. Demonstrate in test case.
Thu, 21 Aug 2008 21:32:06 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 21:32:06 +0200] rev 484
(stable) merge with default
Thu, 21 Aug 2008 19:07:33 +0200 (0.9.2compat) fix test compatibility 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 19:07:33 +0200] rev 483
(0.9.2compat) fix test compatibility Comment out non-backwards compatible hgweb test (at default position). Make kwexpand nonexistent work on Windows (originally by pmezard).
Thu, 21 Aug 2008 10:20:44 +0200 Thorough hgweb testing
Christian Ebert <blacktrash@gmx.net> [Thu, 21 Aug 2008 10:20:44 +0200] rev 482
Thorough hgweb testing - test hgweb while keyword extension is _enabled_ - check expansion with hgweb.file - besides log and diff, also check annotate for not expanding
Thu, 07 Aug 2008 11:20:34 +0200 (stable) merge with default stable
Christian Ebert <blacktrash@gmx.net> [Thu, 07 Aug 2008 11:20:34 +0200] rev 481
(stable) merge with default
Wed, 30 Jul 2008 20:05:14 +0200 (0.9.2compat) add verify to nokwcommands 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 20:05:14 +0200] rev 480
(0.9.2compat) add verify to nokwcommands
Wed, 30 Jul 2008 16:26:38 +0200 Add verify to nokwcommands after refactor in e79a8f36c2a5
Christian Ebert <blacktrash@gmx.net> [Wed, 30 Jul 2008 16:26:38 +0200] rev 479
Add verify to nokwcommands after refactor in e79a8f36c2a5 Add test as well. Thanks to Guy Brand for spotting this.
Mon, 30 Jun 2008 12:42:48 +0200 (0.9.2compat) context, status refactor keeping backwards compatible fallback 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:42:48 +0200] rev 478
(0.9.2compat) context, status refactor keeping backwards compatible fallback
Mon, 30 Jun 2008 12:33:36 +0200 (0.9.2compat) ddb8a222249b is backwards compatible 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Mon, 30 Jun 2008 12:33:36 +0200] rev 477
(0.9.2compat) ddb8a222249b is backwards compatible
Sat, 28 Jun 2008 15:49:54 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 Jun 2008 15:49:54 +0200] rev 476
Merge with stable
Fri, 27 Jun 2008 18:28:45 -0500 util: add sort helper stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 18:28:45 -0500] rev 475
util: add sort helper [ original upstream description]
Fri, 27 Jun 2008 13:43:29 -0500 status: clean up all users for unknown files stable
Matt Mackall <mpm@selenic.com> [Fri, 27 Jun 2008 13:43:29 -0500] rev 474
status: clean up all users for unknown files [ original upstream description]
Thu, 26 Jun 2008 14:35:50 -0500 repo.status: eliminate list_ stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 473
repo.status: eliminate list_ [ original upstream description]
Thu, 26 Jun 2008 14:35:50 -0500 add __len__ and __iter__ methods to repo and revlog stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 472
add __len__ and __iter__ methods to repo and revlog [ original upstream description]
Thu, 26 Jun 2008 14:35:50 -0500 manifest: remove execf/linkf methods stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:50 -0500] rev 471
manifest: remove execf/linkf methods [ original upstream description]
Thu, 26 Jun 2008 14:35:46 -0500 use repo[changeid] to get a changectx stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 14:35:46 -0500] rev 470
use repo[changeid] to get a changectx [ original upstream description]
Thu, 26 Jun 2008 13:46:34 -0500 simplify flag handling stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 13:46:34 -0500] rev 469
simplify flag handling add _checklink var to dirstate introduce dirstate.flagfunc switch users of util.execfunc/linkfunc to flagfunc change manifestdict.set to take a flags string change ctx.fileflags to ctx.flags change gitmode func to a dict remove util.execfunc/linkfunc [ original upstream description]
Thu, 26 Jun 2008 13:46:29 -0500 use repo.changectx(None) to get a workingctx stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Jun 2008 13:46:29 -0500] rev 468
use repo.changectx(None) to get a workingctx [ original upstream description]
Wed, 25 Jun 2008 17:35:20 -0500 context: avoid using None for working parent stable
Matt Mackall <mpm@selenic.com> [Wed, 25 Jun 2008 17:35:20 -0500] rev 467
context: avoid using None for working parent [ original upstream description ]
Wed, 25 Jun 2008 17:34:28 -0500 use repo.changectx rather than context.changectx stable
Matt Mackall <mpm@selenic.com> [Wed, 25 Jun 2008 17:34:28 -0500] rev 466
use repo.changectx rather than context.changectx [ original upstream description ]
Thu, 12 Jun 2008 02:27:06 +0200 (stable) mimic cmdutil.bail_if_changed even more stable
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 02:27:06 +0200] rev 465
(stable) mimic cmdutil.bail_if_changed even more At the check before overwriting with kwexpand, kwshrink: - abort when in middle of merge - give terser abort message
Fri, 13 Jun 2008 17:41:26 +0200 (0.9.2compat) secure keyword arguments in backwards compatible wrappers 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Fri, 13 Jun 2008 17:41:26 +0200] rev 464
(0.9.2compat) secure keyword arguments in backwards compatible wrappers Explicitly assign _all_ keyword args when TypeErrors must be detected.
Thu, 12 Jun 2008 11:10:04 +0200 keyword: disable expansion for annotate stable
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:10:04 +0200] rev 463
keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.
Thu, 12 Jun 2008 16:32:16 +0200 (0.9.2compat) disable expansion for annotate 0.9.2compat
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 16:32:16 +0200] rev 462
(0.9.2compat) disable expansion for annotate
Thu, 12 Jun 2008 11:10:04 +0200 keyword: disable expansion for annotate
Christian Ebert <blacktrash@gmx.net> [Thu, 12 Jun 2008 11:10:04 +0200] rev 461
keyword: disable expansion for annotate Keyword expansion should not be annotated. Annotate revision when unexpanded keyword was inserted. Add test.
(0) -300 -100 -50 -30 +30 +50 +100 +300 tip