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
Mads Kiilerich <mads@kiilerich.com> [Thu, 13 Oct 2011 04:27:49 +0200] rev 15244
tests: cleanup of test-fetch.t
Mads Kiilerich <mads@kiilerich.com> [Thu, 13 Oct 2011 04:27:49 +0200] rev 15243
tests: cleanup of echo statements left over from test conversion
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:59:59 -0500] rev 15242
graft: add examples and information about copied metadata
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:48:57 -0500] rev 15241
graft: add --continue support
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:46:23 -0500] rev 15240
graft: add user, date, and tool options
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:46:03 -0500] rev 15239
graft: add --edit
Matt Mackall <mpm@selenic.com> [Wed, 12 Oct 2011 18:45:36 -0500] rev 15238
graft: add initial implementation
Augie Fackler <durin42@gmail.com> [Wed, 12 Oct 2011 11:09:57 -0500] rev 15237
bookmarks: delegate writing to the repo just like reading
This makes it easier for alternate storage backends to not use flat
files for bookmarks storage.
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:14 +0200] rev 15236
tests: add support for inline doctests in test files
This adds doctest like syntax to .t files, that can be interleaved with regular
shell code:
$ echo -n a > file
>>> print open('file').read()
a
>>> open('file', 'a').write('b')
$ cat file
ab
The syntax is exactly the same as regular doctests, so multiline statements
look like this:
>>> for i in range(3):
... print i
0
1
2
Each block has its own context, i.e.:
>>> x = 0
>>> print x
0
$ echo 'foo'
foo
>>> print x
will result in a NameError.
Errors are displayed in standard doctest format:
>>> print 'foo'
bar
--- /home/idan/dev/hg/default/tests/test-test.t
+++ /home/idan/dev/hg/default/tests/test-test.t.err
@@ -2,3 +2,16 @@
> >>> print 'foo'
> bar
> EOF
+ **********************************************************************
+ File "/tmp/tmps8X_0ohg-tst", line 1, in tmps8X_0ohg-tst
+ Failed example:
+ print 'foo'
+ Expected:
+ bar
+ Got:
+ foo
+ **********************************************************************
+ 1 items had failures:
+ 1 of 1 in tmps8X_0ohg-tst
+ ***Test Failed*** 1 failures.
+ [1]
As for the implementation, it's quite simple: when the test runner sees a line
starting with '>>>' it converts it, and all subsequent lines until the next
line that begins with '$' to a 'python -m heredoctest <<EOF' call with the
proper heredoc to follow. So if we have this test file:
>>> for c in 'abcd':
... print c
a
b
c
d
$ echo foo
foo
It gets converted to:
$ python -m heredoctest <<EOF
> >>> for c in 'abcd':
> ... print c
> a
> b
> c
> d
> EOF
$ echo foo
foo
And then processed like every other test file by converting it to a sh script.
Idan Kamara <idankk86@gmail.com> [Wed, 12 Oct 2011 22:01:13 +0200] rev 15235
tests: add helper script for processing doctests read from stdin
Writes stdin to a temp file and doctests it.
In the future we might want to spare the temp file and directly call into
doctest.
Also, with some tweaking it seems possible to adjust the line numbers reported
in an error report so they match the ones in the original file.
Eric Roshan Eisner <ede@alum.mit.edu> [Tue, 11 Oct 2011 21:34:55 -0700] rev 15234
subrepo: fix git branch tracking logic (issue2920)
Augie Fackler <durin42@gmail.com> [Tue, 11 Oct 2011 17:20:03 -0500] rev 15233
alias: don't shadow commands that we only partially matched (issue2993) (BC)
Previously, if you set an alias for "ci", it'd also shadow "commit"
even though you didn't specify that. This occurred for all commands
with explicit short variations.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Tue, 11 Oct 2011 18:48:45 +0200] rev 15232
resolve: update documentation to mention the .orig backup
Eric Roshan Eisner <ede@alum.mit.edu> [Tue, 11 Oct 2011 18:18:15 -0700] rev 15231
cmdutil.bailifchanged: abort for dirty subrepos
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:10:03 -0400] rev 15230
largefiles: improve help
Extension help taken from the URL formerly in the text
(https://developers.kilnhg.com/Repo/Kiln/largefiles/largefiles/File/usage.txt)
and improved.
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:11:01 -0400] rev 15229
largefiles: use ui.configlist() to split largefiles.patterns
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:07:08 -0400] rev 15228
largefiles: allow minimum size to be a float
Some old-fashioned people (e.g. me) think that incompressible
binary files >100 kB count as "large".
Greg Ward <greg@gerg.ca> [Tue, 11 Oct 2011 21:11:01 -0400] rev 15227
largefiles: factor out lfutil.getminsize()
Na'Tosha Bard <natosha@unity3d.com> [Tue, 11 Oct 2011 14:01:24 +0200] rev 15226
largefiles: cleanup import, now that we can assume > 1.9 for bundled extension
Na'Tosha Bard <natosha@unity3d.com> [Tue, 11 Oct 2011 13:15:29 +0200] rev 15225
largefiles: add test for status
Na'Tosha Bard <natosha@unity3d.com> [Tue, 11 Oct 2011 10:42:56 +0200] rev 15224
largefiles: remove pre-1.9 code from extension first bundled with 1.9
Matt Mackall <mpm@selenic.com> [Tue, 11 Oct 2011 23:16:05 -0500] rev 15223
pyflakes: clean up some import noise
Matt Mackall <mpm@selenic.com> [Tue, 11 Oct 2011 20:21:13 -0500] rev 15222
bdiff: fix pointer aliasing
Matt Mackall <mpm@selenic.com> [Tue, 11 Oct 2011 08:32:04 -0500] rev 15221
import: add --edit switch
Matt Mackall <mpm@selenic.com> [Mon, 10 Oct 2011 23:07:09 -0500] rev 15220
transplant: add --edit option
Matt Mackall <mpm@selenic.com> [Mon, 10 Oct 2011 23:01:25 -0500] rev 15219
rebase: add --edit switch
Augie Fackler <durin42@gmail.com> [Mon, 10 Oct 2011 17:57:40 -0500] rev 15218
httpclient: update to 07d8c356f4d1 of py-nonblocking-http
This addresses a defect when the server closes the socket before
finishing a response (if it crashes, for example) first spotted in
Issue2951.
Andreas Freimuth <andreas.freimuth@united-bits.de> [Mon, 10 Oct 2011 13:52:54 +0200] rev 15217
wireproto: do not call pushkey module directly (issue3041)
Call the repos pushkey/listkeys member function instead.
So the pushkey-hooks are triggered.
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)
Na'Tosha Bard <natosha@unity3d.com> [Mon, 10 Oct 2011 17:33:17 +0200] rev 15215
setup: add largefiles to list of packages
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
Matt Mackall <mpm@selenic.com> [Sun, 09 Oct 2011 11:03:57 -0500] rev 15213
subrepo: add git to the help topic
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 15:19:05 -0500] rev 15212
branch: fix formatting of help note
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.
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:28:13 -0500] rev 15210
backout: add a note about not working on merges
Matt Mackall <mpm@selenic.com> [Sat, 08 Oct 2011 13:23:57 -0500] rev 15209
backout: mark some help verbose
Matt Mackall <mpm@selenic.com> [Fri, 07 Oct 2011 17:22:12 -0500] rev 15208
merge with stable
Elifarley Callado Coelho Cruz [Thu, 06 Oct 2011 19:45:26 -0300] rev 15207
acl: more descriptive error messages
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