Levi Bard <levi@unity3d.com> [Sun, 08 Jan 2012 11:23:21 +0100] rev 15789
largefiles: Fix parser warning: redefinition of unused 'node' from line 14
Martin Geisler <mg@aragost.com> [Sun, 08 Jan 2012 14:50:20 +0100] rev 15788
merge with stable
Na'Tosha Bard <natosha@unity3d.com> [Sun, 08 Jan 2012 12:35:47 +0100] rev 15787
largefiles: fix output of hg summary (
issue3060)
Na'Tosha Bard <natosha@unity3d.com> [Sun, 08 Jan 2012 11:19:51 +0100] rev 15786
largefiles: fix confusion upon removal of added largefile (
issue3176)
This patch makes "hg remove" work the same way on largefiles as it does on
regular Mercurial files. If you try to remove an added largefile, the removal
fails and you are instead prompted to use "hg forget" to undo the add.
Na'Tosha Bard <natosha@unity3d.com> [Sat, 07 Jan 2012 23:37:19 +0100] rev 15785
largefiles: remove invalid comment (
issue3065)
This comment is invalid. The hg.update() function will abort in the case of
any genuine error, so there is nothing to check. If we have gotten to this
point in execution, nothing critical has gone wrong, and if any standins
have been updated, we must pull new largefiles.
Na'Tosha Bard <natosha@unity3d.com> [Sat, 07 Jan 2012 15:35:15 +0100] rev 15784
largefiles: clean up and shorten test output by using the same log format everywhere
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 07 Jan 2012 15:27:34 +0100] rev 15783
largefiles: remove a chunk of commented out code
Martin Geisler <mg@aragost.com> [Fri, 06 Jan 2012 16:27:13 +0100] rev 15782
Remove FSF mailing address from GPL headers
The GPLv3 FAQ suggests to upgrade by
[...] replace all your existing v2 license notices (usually at the
top of each file) with the new recommended text available on the GNU
licenses howto. It's more future-proof because it no longer includes
the FSF's postal mailing address.
This removes the postal address, but leaves the version number at 2+.
Martin Geisler <mg@aragost.com> [Fri, 06 Jan 2012 16:16:58 +0100] rev 15781
dispatch: lowercase abort message
Martin Geisler <mg@lazybytes.net> [Fri, 06 Jan 2012 11:43:17 +0100] rev 15780
merge with stable
Martin Geisler <mg@lazybytes.net> [Fri, 06 Jan 2012 11:15:32 +0100] rev 15779
commands: add link to addremove in commit help text
Kevin Gessner <kevin@fogcreek.com> [Thu, 05 Jan 2012 07:26:22 -0800] rev 15778
largefiles: display remote errors from putlfile (
issue3123) (
issue3149)
Matt Mackall <mpm@selenic.com> [Thu, 05 Jan 2012 20:35:10 -0600] rev 15777
cmdutil: simplify duplicatecopies
Matt Mackall <mpm@selenic.com> [Thu, 05 Jan 2012 14:14:12 -0600] rev 15776
hgcia: fix diffstat support
Matt Mackall <mpm@selenic.com> [Wed, 04 Jan 2012 17:55:30 -0600] rev 15775
copies: rewrite copy detection for non-merge users
The existing copy detection API was designed with merge in mind and
was ill-suited for doing status/diff. The new pathcopies
implementation gives more accurate, easier to use results for
comparing two revisions, and is much simpler to understand.
Test notes:
- test-mv-cp-st.t results finds more renames in the reverse direction now
- test-mq-merge.t was always wrong and duplicated a copy in diff that
was already present in one of the parent revisions
Matt Mackall <mpm@selenic.com> [Wed, 04 Jan 2012 15:48:02 -0600] rev 15774
copies: split the copies api for "normal" and merge cases (API)
Matt Mackall <mpm@selenic.com> [Tue, 03 Jan 2012 17:13:03 -0600] rev 15773
merge with stable
Augie Fackler <durin42@gmail.com> [Mon, 02 Jan 2012 19:30:28 -0600] rev 15772
progress: Use the same GPL boilerplate as most hg files
Augie Fackler <durin42@gmail.com> [Mon, 02 Jan 2012 19:30:21 -0600] rev 15771
color: Use the same GPL boilerplate as most hg files
Matt Mackall <mpm@selenic.com> [Tue, 03 Jan 2012 17:09:26 -0600] rev 15770
tests: patch up silly new year's bug
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Dec 2011 15:01:06 +0100] rev 15769
encoding: use hint markup for "please check your locale settings"
This will also make test-encoding.t pass on windows. The test would hit some
other code path that already used hint markup.
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Dec 2011 15:30:43 +0100] rev 15768
tests: make simple single quotes work with dummyssh on windows
Mercurial assumes that the shell on remote servers over ssh servers uses unix
quoting rules. Tests using dummyssh are however also run on windows where cmd
doesn't parse single quotes like on unix.
This hack replaces the single quotes with double quotes on windows - that is
enough to make test-ssh.t pass after
d8fa35c28335.
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Dec 2011 16:54:43 +0100] rev 15767
tests: ensure platform independent revision hashes in test-notify.t
Makes the test pass again on windows after
ca572e94d8e7.
Mads Kiilerich <mads@kiilerich.com> [Mon, 26 Dec 2011 16:57:14 +0100] rev 15766
tests: ignore slash direction in paths in test-notify-changegroup.t
Fixes testing on windows after
2a7fa7c641d8.