Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:19:24 -0500] rev 15272
rebase: simplify check for orphaned descendants
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 14:19:07 -0500] rev 15271
rebase: simplify set generation
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 15 Oct 2011 20:12:32 +0200] rev 15270
rebase: add --rev option to rebase
This option allow a strict set of revision to be specified instead of using -s
or -b. Rebase will refuse start if striping rebased changeset will strip non
rebased changeset. Rebase will refuse to work on set with multiple root.
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 12:57:47 -0500] rev 15269
rebase: allow revsets for source and base args
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 12:52:43 -0500] rev 15268
revset: fix %r handling in formatspec
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Sat, 15 Oct 2011 19:07:51 +0200] rev 15267
rebase: use revset as soon as possible in internal logic
The buildstate function now take a set of revs. Logic related to --source and
--base option have been moved in the main rebase function.
In the process this fixes a bug where the wrong source changeset might be pick.
This explain the changes in hgext/rebase.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 10:20:08 -0500] rev 15266
revset: add %r for embedded revset support to formatspec
This allows folding external revsets or lists of revsets into a revset
expression. Revsets are pre-parsed for validity so that syntax errors
don't escape.
Angel Ezquerra <angel.ezquerra@gmail.com> [Sat, 15 Oct 2011 01:06:52 +0200] rev 15265
revert: warn that subrepos cannot be reverted
(tests added by mpm)
Greg Ward <greg@gerg.ca> [Wed, 12 Oct 2011 21:45:58 -0400] rev 15264
merge: expand environment variables and ~/ in tool.executable
hgrc(5) already implies that this works, so we might as well support it.
Another approach would be to implement this in util.findexe(): that
would benefit other callers of findexe(), e.g. convert and anyone
calling the user's editor. But findexe() is really implemented in
both posix.py and windows.py, so this would make both of those modules
depend on util.py: not good. So keep it narrow and only for merge
tools.
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 00:39:06 -0500] rev 15263
minirst: improve test harness
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 00:39:04 -0500] rev 15262
minirst: add style flag to format
Matt Mackall <mpm@selenic.com> [Sat, 15 Oct 2011 00:39:01 -0500] rev 15261
minirst: add basic HTML formatting support
Matt Mackall <mpm@selenic.com> [Fri, 14 Oct 2011 15:40:50 -0500] rev 15260
graft: use status verbosity for reporting grafts
Idan Kamara <idankk86@gmail.com> [Fri, 14 Oct 2011 19:10:36 +0200] rev 15259
contrib: add a script to help diagnose raw output of the cmdserver
Idan Kamara <idankk86@gmail.com> [Fri, 14 Oct 2011 19:51:46 +0200] rev 15258
mq: eliminate explicit checks for file existence
Mads Kiilerich <mads@kiilerich.com> [Fri, 14 Oct 2011 02:50:06 +0200] rev 15257
mq: cleanup of lookup - handling of None is not relevant
Patch specifications in mq is passed around as a string or None. None is
generally used when no patch has been specified and there thus is nothing to
lookup and the calling code should do something else. One code path did however
pass None all the way to lookup. That case was handled in lookup, but there was
really need for that, it was undocumented, and it used to cause trouble back
when patches was specified as integers.
Mads Kiilerich <mads@kiilerich.com> [Sun, 31 Oct 2010 18:29:56 +0100] rev 15256
mq: fix corner cases for handling of patch 0 in qselect
Most of the code paths in mq would always pass patch specifications as a
string. Patches can be specified by their index, but one code path passed that
(through pop) to lookup as an integer - all other code paths used a string.
Unfortunately pop and lookup (like many other parts of mq) used the boolean
value of the patch specification to see if it was None, and they would thus
incorrectly handle patch 0 as None.
This patch makes the code comply with the actual internal duck typing of patch
specifications: patch indices must be encoded as strings. The (now) unused code
for partial and thus incorrect handling of indices as integers is removed.
Greg Ward <greg@gerg.ca> [Thu, 13 Oct 2011 21:42:54 -0400] rev 15255
largefiles: cosmetics, whitespace, code style
This is mainly about keeping code under the 80-column limit with as
few backslashes as possible. I am deliberately not making any logic or
behaviour changes here and have restrained myself to a few "peephole"
refactorings.
Greg Ward <greg@gerg.ca> [Thu, 13 Oct 2011 20:45:49 -0400] rev 15254
largefiles: more work on cleaning up comments
- always say "largefile", not "lfile"
- cleanup mangled syntax, hopefully correctly
(punctuation: it's your friend!)
- wrap to 75 columns (where feasible)
Greg Ward <greg@gerg.ca> [Thu, 13 Oct 2011 20:24:29 -0400] rev 15253
largefiles: improve error reporting
- tweak wording of some error messages
- use consistent capitalization
- always say 'largefile', not 'lfile'
- fix I18N problems
- only raise Abort for errors the user can do something about
Greg Ward <greg@gerg.ca> [Wed, 12 Oct 2011 20:59:27 -0400] rev 15252
largefiles: improve comments, internal docstrings
- fix some ungrammatical/unclear/incorrect comments/docstrings
- rewrite some really unclear comments/docstrings
- make formatting/style more consistent with the rest of Mercurial
(lowercase without period unless it's really multiple sentences)
- wrap to 75 columns
- always say "largefile(s)", not "lfile(s)" (or "big files")
- one space between sentences, not two
Na'Tosha Bard <natosha@unity3d.com> [Thu, 13 Oct 2011 15:15:32 +0200] rev 15251
largefiles: flush out tests to cover more operations and known cornercases
Na'Tosha Bard <natosha@unity3d.com> [Thu, 13 Oct 2011 12:11:25 +0200] rev 15250
largefiles: speed up commit by only rewriting standins for modified largefiles
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:38 +0200] rev 15249
tests: add basic tests for doctest syntax
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:37 +0200] rev 15248
run-tests: end doctest block when seeing a non-command
Idan Kamara <idankk86@gmail.com> [Thu, 13 Oct 2011 17:54:35 +0200] rev 15247
tests: remove temp doctest file when finished running it
Mads Kiilerich <mads@kiilerich.com> [Thu, 13 Oct 2011 04:27:49 +0200] rev 15246
httprepo: make __del__ more stable in error situations
Some errors could leave self.urlopener uninitialized and thus cause strange
crashes in __del__.
This member variable is now "declared statically" and checked for assignment
before use.
Mads Kiilerich <mads@kiilerich.com> [Sun, 31 Oct 2010 18:29:55 +0100] rev 15245
tests: exercise some corner cases for mq guard selection and --reapply