Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Mon, 08 Feb 2010 20:51:23 +0100] rev 10405
whitespace cleanup
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Feb 2010 14:02:07 +0100] rev 10404
revlog.size: remove alternate implementation (revlogv0 specific)
it's only useful for revlogv0 anyway, revlogNG has the uncompressed size in
the index.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 09 Feb 2010 13:48:52 +0100] rev 10403
pylintrc: string isn't deprecated, only some of its methods
Brendan Cully <brendan@kublai.com> [Mon, 08 Feb 2010 10:50:00 +0100] rev 10402
mq: make init -Q do what qinit -c did
Brendan Cully <brendan@kublai.com> [Mon, 08 Feb 2010 10:23:44 +0100] rev 10401
mq: add -Q option to all commands not in norepo
Adrian Buehlmann <adrian@cadifra.com> [Sun, 07 Feb 2010 23:07:58 +0100] rev 10400
setup.py: fixing version info for Windows hg.exe (py2exe)
Fixes
warning: py2exe: Version Info will not be included:
could not parse version number ...
which was seen when doing nightly builds. hg.exe files
of nightly builds did not have any version info resoure,
which may cause problems with installers.
Also setting a copyright string for the version resource
(was missing).
Patrick Mezard <pmezard@gmail.com> [Mon, 08 Feb 2010 23:47:23 +0100] rev 10399
test-branch-option: make it executable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Feb 2010 02:53:41 +0100] rev 10398
tests: don't just silently strip port numbers
Steve Losh <steve@stevelosh.com> [Sun, 07 Feb 2010 10:47:54 -0500] rev 10397
mq: add parent node IDs to MQ patches on qrefresh/qnew
The goal of this patch is to add the IDs of the parents of applied MQ patches
into the patch file headers whenever qnew or qrefresh are run.
This will serve as a reminder of when the patches last applied cleanly and
will let us do more intelligent things in the future, such as:
* Resolve conflicts found when qpushing to a new location by merging
instead of simply showing rejects.
* Display better diffs of versioned MQ patches because we can tell how the
patched files have changed in the meantime.
Here are the new rules this patch introduces. They are checked in this order:
* If a patch currently has old, plain-style patch headers ("From:" and
"Date:") do not change the style or add any new headers.
* If the 'mq.plain' configuration setting is true, only plain-style
headers will be used for all MQ patches.
* qnew will initialize new patches with HG-style headers and fill in the
"# Parent" header with the appropriate parent node.
* qrefresh will refresh the "# Parent" header with the current parent of
the current patch.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 08 Feb 2010 19:44:04 +0100] rev 10396
prepush: add more precise error messages
Part of the patch is from timeless@mozdev.org
- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
between discovery and the call to branchmap(). In that case, asking the user
to merge isn't helpful, since only remote has the changes.