Mon, 10 Oct 2011 17:34:17 +0200 largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Na'Tosha Bard <natosha@unity3d.com> [Mon, 10 Oct 2011 17:34:17 +0200] rev 15216
largefiles: add beginnings of test (covers commit, remove, move, copy, and archive)
Mon, 10 Oct 2011 17:33:17 +0200 setup: add largefiles to list of packages
Na'Tosha Bard <natosha@unity3d.com> [Mon, 10 Oct 2011 17:33:17 +0200] rev 15215
setup: add largefiles to list of packages
Sun, 09 Oct 2011 16:14:37 -0500 rebase: move updatedirstate into cmdutil so it can be shared
Matt Mackall <mpm@selenic.com> [Sun, 09 Oct 2011 16:14:37 -0500] rev 15214
rebase: move updatedirstate into cmdutil so it can be shared
Sun, 09 Oct 2011 11:03:57 -0500 subrepo: add git to the help topic
Matt Mackall <mpm@selenic.com> [Sun, 09 Oct 2011 11:03:57 -0500] rev 15213
subrepo: add git to the help topic
Sat, 08 Oct 2011 15:19:05 -0500 branch: fix formatting of help note
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 15:19:05 -0500] rev 15212
branch: fix formatting of help note
Sat, 08 Oct 2011 14:18:18 -0500 backout: deprecate/hide support for backing out merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 14:18:18 -0500] rev 15211
backout: deprecate/hide support for backing out merges This has never worked usefully: - it can't undo a completely unwanted merge, as it leaves the merge in the DAG - it can't undo a faulty merge as that means doing a merge correctly, not simply reverting to one or the other parent Both of these kinds of merge also require coordinated action among developers to avoid the bad merge continuing to affect future merges, so we should stop pretending that backout is of any help here. As backing out a merge now requires a hidden option, it can't be done by accident, but will continue to 'work' for anyone who's already dependent on --parent for some unknown reason.
Sat, 08 Oct 2011 13:28:13 -0500 backout: add a note about not working on merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:28:13 -0500] rev 15210
backout: add a note about not working on merges
Sat, 08 Oct 2011 13:23:57 -0500 backout: mark some help verbose
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:23:57 -0500] rev 15209
backout: mark some help verbose
Fri, 07 Oct 2011 17:22:12 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 17:22:12 -0500] rev 15208
merge with stable
Thu, 06 Oct 2011 19:45:26 -0300 acl: more descriptive error messages
Elifarley Callado Coelho Cruz [Thu, 06 Oct 2011 19:45:26 -0300] rev 15207
acl: more descriptive error messages
Thu, 06 Oct 2011 11:10:06 +0200 largefiles: fix commit of specified file on non-windows
Na'Tosha Bard <natosha@unity3d.com> [Thu, 06 Oct 2011 11:10:06 +0200] rev 15206
largefiles: fix commit of specified file on non-windows
Wed, 05 Oct 2011 10:28:39 +0200 convert: detect false cset boundaries in cvsps descriptions
jakob krainz <jakob@hawo-net.de> [Wed, 05 Oct 2011 10:28:39 +0200] rev 15205
convert: detect false cset boundaries in cvsps descriptions
Tue, 04 Oct 2011 19:43:45 -0400 transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca> [Tue, 04 Oct 2011 19:43:45 -0400] rev 15204
transplant: wrap a transaction around the whole command
Fri, 07 Oct 2011 17:08:24 -0500 help: generate command help into a single RST string for formatting
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 17:08:24 -0500] rev 15203
help: generate command help into a single RST string for formatting
Fri, 07 Oct 2011 16:36:54 -0500 help: unify the two -v notes for command help
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 16:36:54 -0500] rev 15202
help: unify the two -v notes for command help
Wed, 05 Oct 2011 09:20:38 +0300 diff: enhance highlighting with color (issue3034)
Kirill Elagin <kirelagin@gmail.com> [Wed, 05 Oct 2011 09:20:38 +0300] rev 15201
diff: enhance highlighting with color (issue3034) Now the highlighter knows whether it is in the header of the patch or not.
Fri, 07 Oct 2011 15:36:50 -0500 debuginstall: report the template path
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 15:36:50 -0500] rev 15200
debuginstall: report the template path
Sat, 01 Oct 2011 16:42:39 -0400 extensions: print some debug info on import failure
Greg Ward <greg@gerg.ca> [Sat, 01 Oct 2011 16:42:39 -0400] rev 15199
extensions: print some debug info on import failure This is handy if hgext.foo exists but has a bogus "import blah": previously we just discarded the "No module named blah" error. Now at least you can see it with --debug. Not perfect, but better than nothing.
Sun, 02 Oct 2011 14:34:28 -0400 import: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca> [Sun, 02 Oct 2011 14:34:28 -0400] rev 15198
import: wrap a transaction around the whole command Now 'rollback' after 'import' is less surprising: it rolls back all of the imported changesets, not just the last one. As an extra added benefit, you don't need 'rollback -f' after 'import --bypass', which was an undesired side effect of fixing issue2998 (59e8bc22506e).. Note that this is a different take on issue963, which complained that rollback after importing multiple patches returned the working dir parent to the starting point, not to the second-last patch applied. Since we now rollback the entire import, returning the working dir to the starting point is entirely logical. So this change also undoes a732eebf1958, the fix to issue963, and updates its tests accordingly. Bottom line: rollback after import was weird before issue963, understandable since the fix for issue963, and even better now.
Sat, 01 Oct 2011 21:52:44 -0400 import: improve error reporting
Greg Ward <greg@gerg.ca> [Sat, 01 Oct 2011 21:52:44 -0400] rev 15197
import: improve error reporting When applying a series of patch files, it's nice to be explicitly told *which* file is broken.
Sat, 01 Oct 2011 21:51:25 -0400 import: join base with patchurl *after* checking for stdin
Greg Ward <greg@gerg.ca> [Sat, 01 Oct 2011 21:51:25 -0400] rev 15196
import: join base with patchurl *after* checking for stdin This only matters when using the deprecated --base option, and combining --base with a patch on stdin makes no sense. But it's such an obvious bug and easy fix that I couldn't pass it by.
Sat, 01 Oct 2011 21:49:04 -0400 import: rename some local variables
Greg Ward <greg@gerg.ca> [Sat, 01 Oct 2011 21:49:04 -0400] rev 15195
import: rename some local variables
Sat, 01 Oct 2011 21:30:49 -0400 import: simplify status reporting logic (and make it more I18N-friendly)
Greg Ward <greg@gerg.ca> [Sat, 01 Oct 2011 21:30:49 -0400] rev 15194
import: simplify status reporting logic (and make it more I18N-friendly) The old code printed (with ui.status()) the changeset ID created by patch N after committing patch N+1, e.g. applying patch1 applying patch2 applied 1d4bd90af0e4 where 1d4bd90af0e4 is the changeset ID resulting from patch1. That's just weird. It's also inconsistent: we only reported the changeset ID when applying >1 patches. And it's inconsistent with 'commit', which only tells you the new changeset ID in verbose mode. Finally, the existing code was I18N-hostile, since it concatenated translated strings. The new way is to print the just-created changeset ID with ui.note() immediately after committing it. It also clarifies what the user message is for easier I18N.
Fri, 07 Oct 2011 15:36:35 -0500 convert: fix crazy rollback call, broken by recent rollback safety checks
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 15:36:35 -0500] rev 15193
convert: fix crazy rollback call, broken by recent rollback safety checks This was causing test-convert-cvs.t to fail.
Sun, 02 Oct 2011 13:13:46 -0500 rst: fix detection of single-row tables
Matt Mackall <mpm@selenic.com> [Sun, 02 Oct 2011 13:13:46 -0500] rev 15192
rst: fix detection of single-row tables This fixes option lists for commands with only an --mq option.
Sun, 02 Oct 2011 16:41:07 -0500 subrepo: fix repo relative path calculation for root directories (issue3033) stable
Matt Mackall <mpm@selenic.com> [Sun, 02 Oct 2011 16:41:07 -0500] rev 15191
subrepo: fix repo relative path calculation for root directories (issue3033)
Sun, 02 Oct 2011 13:02:15 -0500 subrepo: improve error message when svn isn't found
Matt Mackall <mpm@selenic.com> [Sun, 02 Oct 2011 13:02:15 -0500] rev 15190
subrepo: improve error message when svn isn't found subprocess was returning the following unhelpful message: abort: No such file or directory
Sat, 01 Oct 2011 16:19:33 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 01 Oct 2011 16:19:33 -0500] rev 15189
merge with stable
Sat, 01 Oct 2011 16:39:51 -0400 largefiles: don't break existing tests (syntax error, bad imports)
Greg Ward <greg@gerg.ca> [Sat, 01 Oct 2011 16:39:51 -0400] rev 15188
largefiles: don't break existing tests (syntax error, bad imports)
Sat, 01 Oct 2011 16:18:51 -0500 rollback: use a hint for force
Matt Mackall <mpm@selenic.com> [Sat, 01 Oct 2011 16:18:51 -0500] rev 15187
rollback: use a hint for force
(0) -10000 -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 +3000 +10000 +30000 tip