Matt Mackall <mpm@selenic.com> [Sat, 13 Jun 2009 18:08:51 -0500] rev 8806
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Sat, 13 Jun 2009 23:02:51 +0200] rev 8805
bisect: improve --command output
- Display tested revisions without --verbose
- Display revision number
Patrick Mezard <pmezard@gmail.com> [Sat, 13 Jun 2009 22:42:16 +0200] rev 8804
dirstate: fix typo introduced by 3507f6c7715c
Patrick Mezard <pmezard@gmail.com> [Sat, 13 Jun 2009 22:42:15 +0200] rev 8803
test-bisect: test --command option
Patrick Mezard <pmezard@gmail.com> [Sat, 13 Jun 2009 22:42:13 +0200] rev 8802
bisect: fix traceback when command executable is not found
Matt Mackall <mpm@selenic.com> [Sat, 13 Jun 2009 18:01:48 -0500] rev 8801
share: add experimental share extension
Matt Mackall <mpm@selenic.com> [Sat, 13 Jun 2009 18:01:47 -0500] rev 8800
add helper function to create shared repos
Matt Mackall <mpm@selenic.com> [Sat, 13 Jun 2009 18:01:46 -0500] rev 8799
repo: add internal support for sharing store directories
set .hg/sharedpath to point to the .hg to share with
Matt Mackall <mpm@selenic.com> [Fri, 12 Jun 2009 02:19:51 -0500] rev 8798
remoteui: properly create dst with copy()
Matt Mackall <mpm@selenic.com> [Sat, 13 Jun 2009 14:44:59 -0500] rev 8797
repo: set up ui and extensions earlier
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 10 Jun 2009 19:11:49 -0400] rev 8796
localrepo: remove 'closed' argument to heads(...) function
- repository heads are not associated with the closed attribute, so
remove it making the code in line with the concept.
- Fix functions that were calling heads with the parameter.
- Adjust webcommands.branches to include the concept of inactive
as well as open and closed branches
- Fix code and docstrings in commands to make the correct use of
closed branches & branch heads clearer
- Improve grammar of 'hg heads' help text (2nd submission)
this does not alter the cli for hg branches, that work is
still to be done
Adrian Buehlmann <adrian@cadifra.com> [Mon, 08 Jun 2009 20:02:44 +0200] rev 8795
mq: eliminate warning on qpush with empty series
Warning was "DeprecationWarning: use lock.release instead of del lock"
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 23 May 2009 20:38:08 +0900] rev 8794
inotify: repowatcher: don't use a watches attribute to count watches
The encapsulated watcher alread has a __len__ method for this purpose.
Also, repowatcher.watches was never decremented on watch deletions.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 21 May 2009 23:51:54 +0900] rev 8793
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com> [Thu, 21 May 2009 20:15:00 +0900] rev 8792
inotify: refactor (un)register methods into pollable object
repowatcher.master becomes unnecessary
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Jun 2009 18:41:28 +0200] rev 8791
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 13 Jun 2009 18:14:50 +0200] rev 8790
inotify: add log config option redirect inotify server output to a file
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 25 May 2009 18:14:32 +0900] rev 8789
cmdutil: service: logfile option to redirect stdout & stderr in a file
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sat, 13 Jun 2009 17:39:01 +0200] rev 8788
inotify: raise QueryFailed when the server crash
When the server crashes, it does not write back on the socket. The message
which is then read from the socket is '', which raises a TypeError.
Catching TypeError to raise QueryFailed instead.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Wed, 27 May 2009 00:29:11 +0900] rev 8787
inotify: server: move split() out of server
split() has nothing to do with the server logic, it does not need to be
in the class. Move it on top, next to join() which does the opposite.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Jun 2009 17:23:08 +0200] rev 8786
inotify: remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 13 Jun 2009 13:14:02 +0200] rev 8785
atomictempfile: fix exception in __del__ if mktempcopy fails (self._fp is None)
Make what is going on more obvious by explicitely getting the 'closed'
attribute from _fp, instead of from the gettatr proxy.
Brendan Cully <brendan@kublai.com> [Thu, 11 Jun 2009 12:23:08 -0700] rev 8784
Merge with crew-stable
Brendan Cully <brendan@kublai.com> [Thu, 11 Jun 2009 12:18:40 -0700] rev 8783
bzr convert: restore paths to source encoding. Closes issue1692.
Martin Geisler <mg@lazybytes.net> [Thu, 11 Jun 2009 17:29:14 +0200] rev 8782
doc: wrap man pages after fixing quoting
Martin Geisler <mg@lazybytes.net> [Thu, 11 Jun 2009 17:19:48 +0200] rev 8781
hgrc.5: fix quoting of literal strings
The quotes would go wrong in many places due to differences between
asciidoc version 8.2.7 used by Benoit and 8.4.5 used by me. Between
those versions asciidoc stopped interpreting the content of `quoted
strings`, and so `*` would start bold text in the old version, but do
nothing in the new version.
To complicate things further, `\*` would escape the bold tag in the
old version, but in the new version the backslash was inserted
literally into the output (because the backtick quotes it).
I've now replaced backticks with non-quoting plusses and escaped
backslashes as appropriate.
Martin Geisler <mg@lazybytes.net> [Thu, 11 Jun 2009 17:16:04 +0200] rev 8780
hgignore.5: remove extra quotes
The so-called "unconstrained quotes" didn't really work, so I reverted
them to normal quotes. Tested with asciidoc version 8.2.7 and 8.4.5.
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 21:51:34 -0400] rev 8779
Improve English for help text of many core hg commands.
co-author: Greg Ward <greg-hg@gerg.ca>
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Jun 2009 15:10:21 +0200] rev 8778
use new style classes
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Jun 2009 03:20:20 +0200] rev 8777
doc: correctly escape *
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 10 Jun 2009 03:10:46 +0200] rev 8776
doc: correctly escape *
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 01:14:16 +0200] rev 8775
hg.1: highlight references to commands and man pages
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 01:09:21 +0200] rev 8774
hg.1: simplify synopsis
Now that arguments can be mixed with options we can simplify the
synopsis considerably. Also, highlighting the command name in bold
(instead of italics) seem to be the standard convention.
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 00:55:57 +0200] rev 8773
hgrc.5: spell check
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 00:46:30 +0200] rev 8772
man pages: add meta data
This removes the fixme's that were otherwise inserted.
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 00:13:08 +0200] rev 8771
man pages: updated copyright years
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 00:11:24 +0200] rev 8770
hgrc.5: use NOTE admonition paragraph
Martin Geisler <mg@lazybytes.net> [Wed, 10 Jun 2009 00:06:20 +0200] rev 8769
hgrc.5: reformatted to avoid big chunks of monospaced text
The man page used to have lines longer than 80 characters, even though
all lines in the hgrc.5.txt file were wrapped nicely. The problem
turned out to be that the indented paragraphs started literal blocks
instead of normal paragraphs. The literal blocks were of course not
wrapped when displayed by man.
In short, the asciidoc rules require lists to be formatted like this:
foo::
Some description of foo.
+
Another paragraph in the description of foo. It *must* start flush
left and the plus is necessary to indicate that this is a list item
continuation.
Lists with nested lists can be formatted correctly using something
called "open blocks". These blocks are used to group the list items
and are marked by a line above and below with two dashes. See the
asciidoc user guide for the gory details...
Martin Geisler <mg@lazybytes.net> [Tue, 09 Jun 2009 23:26:16 +0200] rev 8768
hgrc.5: mark filename patterns as monospaced text
Martin Geisler <mg@lazybytes.net> [Tue, 09 Jun 2009 23:24:43 +0200] rev 8767
hgrc.5: single quotes means italic in asciidoc
Use double quotes instead and mark the * as monospaced text.
Martin Geisler <mg@lazybytes.net> [Tue, 09 Jun 2009 23:08:55 +0200] rev 8766
man pages: mark filenames and env vars as fixed text
Patrick Mezard <pmezard@gmail.com> [Tue, 09 Jun 2009 21:50:42 +0200] rev 8765
test-convert-svn-*: no longer need the url building code
Edouard Gomez <ed.gomez@free.fr> [Sat, 06 Jun 2009 00:08:37 +0200] rev 8764
convert: default to file protocol when no :// found for svn repo url
Edited by pmezard: add path separator normalization
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:34 -0400] rev 8763
keyword: improve English
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:25 -0400] rev 8762
bookmarks: improve English
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:17 -0400] rev 8761
Generally replace "file name" with "filename" in help and comments.
timeless <timeless@gmail.com> [Tue, 09 Jun 2009 09:25:31 -0400] rev 8760
Spell Mercurial as a proper noun
Matt Mackall <mpm@selenic.com> [Tue, 09 Jun 2009 11:55:32 -0500] rev 8759
win32text: drop disabling portion of test
disabling extension leaves dirstate confused about whether affected
files are clean or not, not much point testing it.
Tobias Bell <tobias.bell@gmail.com> [Mon, 08 Jun 2009 20:09:48 +0200] rev 8758
i18n-de: Synchronised with hg.pot
translated by Fabian Kreutz <fabian.kreutz@qvantel.com>
Tobias Bell <tobias.bell@gmail.com>
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 09 Jun 2009 11:49:16 -0300] rev 8757
i18n-pt_BR: synchronized and updated
- synchronized with hg 6019e6517f95
- translated remaining messages
- many spelling and formatting fixes
Henrik Stuart <hg@hstuart.dk> [Tue, 09 Jun 2009 08:59:49 +0200] rev 8756
convert: better support for CVS branchpoints (issue1447)
This records the branches starting at individual CVS file revisions,
using the symbolic names map rather than just the branches
information. This information is used to generate Mercurial
changesets. Despite the changes, the CVS conversion still suffers
heavily from cvsps' deficiencies in generating a correct
representation of the CVS repository history.
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:21:13 -0500] rev 8755
Merge with stable
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:16:32 -0500] rev 8754
Merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8753
merge: refactor manifestmerge init to better report effective ancestor
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8752
merge: simplify file revision comparison logic
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8751
merge: make locally-added file test more correct
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8750
merge: drop unused diverge initialization
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8749
merge: refactor some initialization, drop backwards var
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8748
merge: combine a copy and move case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8747
merge: drop a flag update case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8746
merge: combine three identical 'remote is newer' cases
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8745
merge: drop 'remote deleted' case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8744
merge: simplify 'other deleted' case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8743
merge: simplify backwards revert test, ready to combine with other cases
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8742
merge: allow merging going backwards
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.
case 1: update to .
a-w -> a-w
classic: ancestor a
missing recreated right?
rmed recreated WRONG
added forgotten WRONG
changed preserved RIGHT
conflicted can't happen
backward merge: ancestor a (NO EFFECT)
missing missing wrong?
rm'ed rm'ed RIGHT
added preserved RIGHT
changed preserved RIGHT
conflicted can't happen
case 2: update to ancestor of .
a-b-w -> b-w
\
a
classic: ancestor a
missing recreated right?
rmed recreated wrong?
added forgotten wrong?
changed preserved RIGHT
conflicted preserved wrong?
backwards merge: ancestor b
missing missing or conflict right?
rm'ed missing or conflict right?
changed preserved RIGHT
conflicted merge RIGHT
added preserved right?
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8741
merge: reorder remote creation tests
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8740
merge: drop recreating case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8739
merge: drop an overwrite test
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8738
merge: simplify a delete case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8737
merge: reorder get cases for future simplification
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8736
merge: fix prompt keep
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8735
merge: remove a flags case
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8734
merge: pretend ancestor is local to simplify backwards and overwrite
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8733
merge: simplify flag merging code slightly
Matt Mackall <mpm@selenic.com> [Mon, 08 Jun 2009 18:14:44 -0500] rev 8732
dirstate: eliminate reference cycle from normalize
Bound methods hold a reference to self, so assigning a bound method to
an instance unavoidably creates a cycle. Work around this by choosing
a normalize method at walk time instead. Eliminate default arg while
we're at it.
Henri Wiechers <hwiechers@gmail.com> [Sun, 07 Jun 2009 21:16:05 +0200] rev 8731
cleanup: removed unused imports
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:14:24 +0200] rev 8730
hgrc.5: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:13:58 +0200] rev 8729
hgignore.5: wrap lines at 70 chars (whitespace cleanup)
Martin Geisler <mg@lazybytes.net> [Mon, 08 Jun 2009 00:13:35 +0200] rev 8728
hg.1: wrap lines at 70 chars (whitespace cleanup)
timeless <timeless@gmail.com> [Sun, 07 Jun 2009 17:34:12 +0200] rev 8727
hgrc.5: language fixes
Christian Ebert <blacktrash@gmx.net> [Mon, 01 Jun 2009 02:17:57 +0200] rev 8726
hgrc.5: wrap manpage at 80 chars
Checked with asciidoc 8.4.5
Abderrahim Kitouni <a.kitouni@gmail.com> [Thu, 04 Jun 2009 21:24:29 +0100] rev 8725
bookmarks: update docstring
Brendan Cully <brendan@kublai.com> [Sat, 06 Jun 2009 15:38:03 -0700] rev 8724
Unbreak run-tests support for out-of-tree extensions
Brendan Cully <brendan@kublai.com> [Sat, 06 Jun 2009 13:37:41 -0700] rev 8723
Merge with crew-stable
Arne Babenhauserheide <bab@draketo.de> [Fri, 05 Jun 2009 15:08:45 +0200] rev 8722
Some platforms lack the PATH_MAX definition (eg. GNU/Hurd).
Thanks to ronny for making it cleaner.
Will Maier <willmaier@ml1.net> [Thu, 04 Jun 2009 18:11:11 -0600] rev 8721
test-fncache: Use find instead of ls -R.
Different platforms implement -R differently (and it produces
unneccessarily verbose output in this case). find is just as
good and more consistent. Unbreaks test on OpenBSD.
Edited by pmezard: added 'sort' call
Will Maier <willmaier@ml1.net> [Thu, 04 Jun 2009 17:33:30 -0600] rev 8720
Make test-verify SUSv3 compatible.
'head -c' isn't supported on (at least) OpenBSD and is not
part of SUSv3. Instead, use dd.
See also:
http://www.opengroup.org/onlinepubs/009695399/utilities/head.html
Steve Losh <steve@stevelosh.com> [Wed, 03 Jun 2009 22:58:43 -0400] rev 8719
Support branch names in contrib/bash_completion
Anywhere a revision is needed a branch name can be used to specify
the tip of that branch, so branch names should be tab completed.
Steve Losh <steve@stevelosh.com> [Wed, 03 Jun 2009 22:54:53 -0400] rev 8718
Support merge in contrib/bash_completion
Matt Mackall <mpm@selenic.com> [Thu, 04 Jun 2009 16:21:55 -0500] rev 8717
context: add a dirty method to detect modified contexts
Matt Mackall <mpm@selenic.com> [Thu, 04 Jun 2009 16:21:09 -0500] rev 8716
dirstate: don't complain about 0-length files
Matt Mackall <mpm@selenic.com> [Thu, 04 Jun 2009 16:21:03 -0500] rev 8715
commit: move some setup outside the lock
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 04 Jun 2009 21:23:31 +0900] rev 8714
Add cp950 as problematic encoding which is used in chinese windows.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 04 Jun 2009 18:05:50 +0200] rev 8713
hgweb: allow distinction between open/closed branches on branches page
Matt Mackall <mpm@selenic.com> [Wed, 03 Jun 2009 17:12:48 -0500] rev 8712
commit: rename wctx to cctx
Matt Mackall <mpm@selenic.com> [Wed, 03 Jun 2009 17:07:41 -0500] rev 8711
mq: fix commit prototype
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 22:13:08 -0500] rev 8710
commit: trade O(n^2) file checks for O(n^2) dir checks
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 21:51:00 -0500] rev 8709
commit: move explicit file checking into repo.commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 20:25:01 -0500] rev 8708
dirstate: more accurate use of match.dir callback
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:51:47 -0500] rev 8707
commit: editor reads file lists from provided context
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:32 -0500] rev 8706
commit: drop the now-unused files parameter
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 14:11:19 -0500] rev 8705
tag: use match.exact for commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8704
commands: drop files arg for commit calls
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8703
transplant: use match object rather than files for commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8702
rebase: remove unneeded status call before commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8701
gpg: use match.exact rather than files for commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8700
mq: drop unneeded files args for commit
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8699
commit: apply force flag without files
Matt Mackall <mpm@selenic.com> [Mon, 01 Jun 2009 13:51:21 -0500] rev 8698
fetch: no need to pass files list to commit
Marco Beck <mbeck@miamod.de> [Wed, 03 Jun 2009 14:50:03 +0200] rev 8697
templater: retain author's full name if no email is supplied (issue1685)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 03 Jun 2009 14:10:36 +0200] rev 8696
tests: delete parallel coverage files after combining
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 03 Jun 2009 13:59:38 +0200] rev 8695
heads: show closed heads only when --closed is passed
Add a --closed (-c) option to 'hg heads' to show all heads and change the
default behavior to refrain from showing fully closed branches.
Enhance 'hg heads <branch>' so that:
* default: displays normal & inactive heads, not closed heads
* --closed: displays normal, inactive & closed heads
* --active: displays only normal heads
* both --closed and --active: displays normal & closed heads only
John Mulligan <phlogistonjohn@asynchrono.us> [Wed, 03 Jun 2009 13:42:55 +0200] rev 8694
localrepo: set heads and branchheads to be closed=False by default
The heads(...) and branchheads(...) functions will now only return closed
heads when explicitly asked for them. This will cause 'hg merge' to have
better behavior in the presence of a branch that has closed heads when no
explicit rev is passed.
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Jun 2009 17:12:42 +0200] rev 8693
convert: rewrite tags when converting from hg to hg
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Jun 2009 17:12:41 +0200] rev 8692
convert: default revisions order depends on source
When converting Mercurial repositories you expect the revision numbers to be
preserved, while other sources conversions focus on efficiency.
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Jun 2009 17:12:39 +0200] rev 8691
convert: fail fast if source does not support --sourcesort
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Jun 2009 17:12:39 +0200] rev 8690
convert: add --sourcesort option for source specific sort
Only supported by Mercurial source for now.
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Jun 2009 17:12:38 +0200] rev 8689
convert: parse sort mode sooner
Patrick Mezard <pmezard@gmail.com> [Mon, 01 Jun 2009 17:12:37 +0200] rev 8688
convert: split toposort() into subfunctions for readability
Greg Ward <greg-hg@gerg.ca> [Mon, 01 Jun 2009 09:18:35 -0400] rev 8687
run-tests: don't replace PYTHONPATH, just augment it.
(Needed at least for Subversion bindings on OS X, which are in
/opt/subversion. Useful for other external libraries installed in
non-standard places too.)
Martin Geisler <mg@lazybytes.net> [Mon, 01 Jun 2009 01:24:01 +0200] rev 8686
merge with mpm
Martin Geisler <mg@lazybytes.net> [Mon, 01 Jun 2009 00:56:29 +0200] rev 8685
color: yet another typo
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8684
match: fold plan cases down to two special cases
- merge always and match with patterns
- make always and match with patterns the default
- invert dostep3 to skipstep3
- move dirignore test inside exact case
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8683
walk: refactor walk plan
- never is gone
- reorder tests more cleanly
- rename nomatches to exact for clearer semantics
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8682
match: remove match.never
Only one user, can be translated to match.exact()
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8681
walk: use match.bad callback for filetype messages
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8680
match: ignore return of match.bad
All users returned false, return can now be dropped
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8679
add: use match.bad callback more effectively
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8678
match: document bad callback semantics
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8677
walk: simplify logic for badfn clause
- matchfn redundant
- call badfn always rather than fwarn
- use for/else rather than keep var
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8676
walk: we always have a badfn
Matt Mackall <mpm@selenic.com> [Sun, 31 May 2009 17:54:18 -0500] rev 8675
walk: simplify check for missing file
Greg Ward <greg-hg@gerg.ca> [Sun, 31 May 2009 15:20:31 -0400] rev 8674
run-tests: redefine --with-hg so it takes the 'hg' script to run.
- in parseargs(), check that --with-hg value is valid
- add handy --local option for "--with-hg=../hg"
- ensure that we always set PATH and PYTHONPATH (not just
when doing a temporary install)
- override any existing PYTHONPATH, so test success does not
depend on whatever happens to be in the caller's environment
- give tests a little more control by exporting $PYTHON to the
environment; needed by test-convert and test-mergetool when
they run hg with a stripped-down $PATH
Also, add a big comment explaining all the corner cases to test for the
next person who tries to modify this script.
Greg Ward <greg-hg@gerg.ca> [Fri, 29 May 2009 22:18:16 -0400] rev 8673
run-tests: fix _checkhglib() so it's correct when using --with-hg.
Since this makes the warning less likely, upgrade it to a "real"
warning to stderr.
Greg Ward <greg-hg@gerg.ca> [Fri, 29 May 2009 22:18:15 -0400] rev 8672
run-tests: factor out _checkhglib() to check import path of 'mercurial'.
- rename _hgpath() to _gethgpath() and move it down next to _checkhglib()
- change _gethgpath() so it caches its result: replaces global 'hgpkg'
that anyone can use with global '_hgpath' that is only for _gethgpath()
- no need to pass 'expecthg' to runchildren() or runtests() anymore
Also: do not change global PYTHON when doing coverage; this seems to
be unnecessary, since we create a dummy 'hg' script that handles
coverage for us, and it made things brittle. (E.g. the rest of this
patch makes the call to _hgpath() come later, and it was broken by
enabling coverage.)
Greg Ward <greg-hg@gerg.ca> [Fri, 29 May 2009 22:17:53 -0400] rev 8671
run-tests: show PID if running in parallel mode with -v.
(Extremely handy when you break parallel operation and need to figure
out what's going on. The assumption is that if you run with -v, you
want more details.)
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 19:48:37 +0200] rev 8670
i18n-da: synchronized and updated slightly
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 18:09:19 +0200] rev 8669
commands: typo in bundle abort message
This error trigger if one calls bundle with the wrong parameters and
it is thus not an error scripts will want to look for (they could and
should ensure that they call bundle with the correct parameters).
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:55:51 +0200] rev 8668
fixed typos found in translatable strings
This is from a spell-check of hg.pot.
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:53:46 +0200] rev 8667
graphlog, win32mbcs: capitalize ASCII
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:52:22 +0200] rev 8666
highlight: consistently capitalize Pygments
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:51:37 +0200] rev 8665
win32mbcs: capitalize Unicode
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 14:48:17 +0200] rev 8664
commands: expand "arg" -> "argument" in showconfig help strings
It is easier to translate full sentences without abbreviations, or
said differently, I don't know a short Danish word for "argument".
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 01:30:16 +0200] rev 8663
wrap string literals in error messages
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 01:29:30 +0200] rev 8662
convert/gnuarch: wrap long line, format kwargs without spaces
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 01:28:18 +0200] rev 8661
convert/cvsps: wrap long lines
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 01:26:23 +0200] rev 8660
convert/subversion: wrap long lines in comments
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 01:13:45 +0200] rev 8659
test-hybridencode: break long string literals
Martin Geisler <mg@lazybytes.net> [Sun, 31 May 2009 00:58:20 +0200] rev 8658
revlog: make triple-quoted string a real comment
Martin Geisler <mg@lazybytes.net> [Sat, 30 May 2009 23:42:35 +0200] rev 8657
posix: do not use fstat in isowner
The fstat function was undefined, but never used since a stat object
was always passed in the optional st argument. Passing st is now
mandatory.
This bug crept in when util was split up into posix and windows
modules. The fstat function is still defined in util, but importing it
into posix would create an import cycle which seems unnecessary.
Martin Geisler <mg@lazybytes.net> [Sat, 30 May 2009 23:20:30 +0200] rev 8656
removed unused imports
Brendan Cully <brendan@kublai.com> [Sat, 30 May 2009 11:32:23 -0700] rev 8655
Move alias into core
Cédric Duval <cedricduval@free.fr> [Sat, 30 May 2009 19:37:01 +0200] rev 8654
mq: rename setheader to updateheader and fix comment
Cédric Duval <cedricduval@free.fr> [Sat, 30 May 2009 19:18:29 +0200] rev 8653
mq: initializing patchheader class directly from patch content
The patch header needs only be read in order to instantiate the class,
and as such it makes more sense to do it within the class.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 29 May 2009 21:31:33 -0700] rev 8652
Merge with mpm
Greg Ward <greg-hg@gerg.ca> [Fri, 29 May 2009 10:00:03 -0400] rev 8651
run-tests: clarify timeout log message.
Matt Mackall <mpm@selenic.com> [Wed, 27 May 2009 16:01:34 -0500] rev 8650
revlog: refactor chunk cache interface again
- chunk to _chunk
- _prime to _chunkraw
- _chunkclear for cache clearing
- _chunk calls _chunkraw
- clean up _prime a bit
- simplify users in revision and checkinlinesize
- drop file descriptor passing (we're better off opening fds lazily
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 28 May 2009 17:44:57 +0200] rev 8649
clone: fall back to pull source repo cannot be locked, 937ee88da3ef was a noop
937ee88da3ef was a noop, it was missing the wait keyword
Garth Roxburgh-Kidd <garth@deadlybloodyserious.com> [Thu, 28 May 2009 17:03:35 +0200] rev 8648
fixed 0xc0150004 error building Mercurial under Python 2.6 for Windows
Adrian Buehlmann <adrian@cadifra.com> [Thu, 28 May 2009 08:29:40 +0200] rev 8647
localrepo: move comment
Simon Heimberg <simohe@besonet.ch> [Wed, 27 May 2009 14:16:13 +0200] rev 8646
localrepo: use lock.release for single lock
Martin Geisler <mg@lazybytes.net> [Wed, 27 May 2009 23:39:41 +0200] rev 8645
dirstate: fixed typo in comment
Matt Mackall <mpm@selenic.com> [Wed, 27 May 2009 14:44:55 -0500] rev 8644
changelog: make delayopener less intrusive
Matt Mackall <mpm@selenic.com> [Wed, 27 May 2009 14:44:54 -0500] rev 8643
revlog: report indexfile rather than datafile for integrity check
Matt Mackall <mpm@selenic.com> [Wed, 27 May 2009 14:44:52 -0500] rev 8642
ui: fix two bugs in %% warning
Matt Mackall <mpm@selenic.com> [Wed, 27 May 2009 14:44:51 -0500] rev 8641
revlog: move stat inside lazyparser
Matt Mackall <mpm@selenic.com> [Mon, 25 May 2009 12:48:15 -0500] rev 8640
dirstate: notice truncated parents read
Matt Mackall <mpm@selenic.com> [Mon, 25 May 2009 10:44:37 -0500] rev 8639
lookup: check for dirstate damage on failure
Christian Ebert <blacktrash@gmx.net> [Tue, 26 May 2009 23:09:38 +0200] rev 8638
keyword: rename matcher() to match() mimicking changes in main
Cédric Duval <cedricduval@free.fr> [Sun, 24 May 2009 22:15:48 +0200] rev 8637
tests: test for dispatch on [defaults]: more clearly differing output
Using '-r null' instead of '-v' as the overriden command default.
The latter did not have any effect on output, thus not giving much
indication on whether the modified defaults were really in use or not.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 27 May 2009 16:25:31 +0200] rev 8636
merge: whitespace cleanup
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 27 May 2009 14:11:41 +0200] rev 8635
revlog: add test for 7659eecd9da2 (issue1678)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 27 May 2009 02:46:59 +0200] rev 8634
changegroup: the node list might be an empty generator (fix issue1678)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 26 May 2009 23:49:53 +0200] rev 8633
store encoding: .i/.d encoding for non-store repo (broken by 810387f59696)
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 22:59:52 +0200] rev 8632
replace "i in range(len(xs))" with "i, x in enumerate(xs)"
The remaining occurrences should be the ones where "xs" is mutated or
where "i" is used for index arithmetic.
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 22:37:26 +0200] rev 8631
util: simplify range expression
The n index variable was unused. Every iteration would pop one element
off of parts, so the for loop can be replaced with a while loop.
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 22:09:39 +0200] rev 8630
color: cleanup extra commas
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 22:02:10 +0200] rev 8629
setup: execute hg in C locale
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 21:13:21 +0200] rev 8628
setup: handle trust warnings when determining version
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 21:07:41 +0200] rev 8627
setup: renamed l, e vars to out, err
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 20:12:37 +0200] rev 8626
hggettext: ensure correct Mercurial is imported
Martin Geisler <mg@lazybytes.net> [Tue, 26 May 2009 19:51:22 +0200] rev 8625
Makefile: do not create i18n/, it is already there
Martin Geisler <mg@lazybytes.net> [Mon, 25 May 2009 23:06:11 +0200] rev 8624
replace xrange(0, n) with xrange(n)
Martin Geisler <mg@lazybytes.net> [Mon, 25 May 2009 22:54:16 +0200] rev 8623
color: replace re.split with ui.configlist
Martin Geisler <mg@lazybytes.net> [Mon, 25 May 2009 22:44:53 +0200] rev 8622
color: use lists instead of tuples for effects
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 26 May 2009 10:16:17 +0200] rev 8621
hgweb: extract config values after reading webdir-config
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 25 May 2009 18:34:35 +0200] rev 8620
tests: make coverage run in parallel mode, clean up coverage code
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 25 May 2009 13:52:09 +0200] rev 8619
revlog: fix undefined variable introduced in 5726bb290bfe
Cédric Duval <cedricduval@free.fr> [Sun, 24 May 2009 22:17:10 +0200] rev 8618
parentrevspec: remove a trailing colon
Cédric Duval <cedricduval@free.fr> [Sun, 24 May 2009 22:17:12 +0200] rev 8617
purge: fix spelling error
Martin Geisler <mg@lazybytes.net> [Sun, 24 May 2009 23:53:28 +0200] rev 8616
zsh-comp: explain how to use for non-global install
Martin Geisler <mg@lazybytes.net> [Sun, 24 May 2009 22:37:20 +0200] rev 8615
use ui instead of repo.ui when the former is in scope