Adrian Buehlmann <adrian@cadifra.com> [Tue, 03 Jun 2008 09:31:36 +0200] rev 6634
mq: qimport: explain insertion point in doc string
Patrick Mezard <pmezard@gmail.com> [Mon, 02 Jun 2008 21:38:52 +0200] rev 6633
test-convert-mtn: test descriptions with quotes
David Reiss <davidn@gmail.com> [Fri, 16 May 2008 00:48:23 -0700] rev 6632
convert.monotone: fix quotes and backslashes in change descriptions.
Stefano Tortarolo <stefano.tortarolo@gmail.com> [Thu, 29 May 2008 22:21:29 +0200] rev 6631
Active branches fix (issue1104)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 26 May 2008 14:20:26 +0200] rev 6630
hgweb: correctly validate permissions with streamclone pulling
Lee Cantey <lcantey@gmail.com> [Sun, 25 May 2008 14:05:35 -0700] rev 6629
Fix bad span tag in Readme
Patrick Mezard <pmezard@gmail.com> [Sat, 24 May 2008 18:11:34 +0200] rev 6628
test-mq-merge: test mq merge and explicit patch queue
teki321@gmail.com [Thu, 08 May 2008 14:02:42 +1000] rev 6627
mq: qpush -n fix
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 23 May 2008 16:50:17 +0200] rev 6626
tests: don't run test-convert-cvs if there's no cvs server
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 23 May 2008 13:59:23 +0200] rev 6625
improve help text for clone -U
Matt Mackall <mpm@selenic.com> [Thu, 22 May 2008 15:48:44 -0500] rev 6624
Added signature for changeset d5cbbe2c49ce
Matt Mackall <mpm@selenic.com> [Thu, 22 May 2008 15:48:42 -0500] rev 6623
Added tag 1.0.1 for changeset d5cbbe2c49ce
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 May 2008 13:29:47 +0200] rev 6622
merge from crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 May 2008 13:28:34 +0200] rev 6621
mq: lose the trailing whitespace
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 22 May 2008 13:26:39 +0200] rev 6620
improve help text for push (explanation of -r)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 May 2008 10:23:47 +0200] rev 6619
merge from crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 May 2008 10:02:28 +0200] rev 6618
merge from crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 18 May 2008 23:49:33 +0200] rev 6617
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 18 May 2008 23:31:54 +0200] rev 6616
hgk: difftree must match all files when supplied list is empty
Patrick Mezard <pmezard@gmail.com> [Sun, 18 May 2008 23:09:59 +0200] rev 6615
status: fix "added" attributes renamed in bf2bf986ff87
Adrian Buehlmann <adrian at cadifra.com> [Wed, 14 May 2008 01:08:51 +0200] rev 6614
doc/hgrc.5.txt: add anchors for sections
Enables links into hgrc.5.html of the form: hgrc.5.html#section
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 17 May 2008 09:12:49 +0200] rev 6613
merge from crew-stable
Adrian Buehlmann <adrian@cadifra.com> [Wed, 23 Apr 2008 19:40:15 +0200] rev 6612
gendoc: add anchors for commands
Enables links into hg.1.html of the form: hg.1.html#command
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 May 2008 10:22:15 +0200] rev 6611
mq: add correct documentation for qpop
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 19 May 2008 10:19:59 +0200] rev 6610
Backed out changeset ff5ef3c0fe10 (fixes wrong documentation)
Jeff Walden <jwalden@mit.edu> [Mon, 19 May 2008 03:52:26 -0400] rev 6609
Slight improvement to qpop arguments help
Patrick Mezard <pmezard@gmail.com> [Sun, 18 May 2008 20:54:10 +0200] rev 6608
test-mq: update qdiff summary output
Patrick Mezard <pmezard@gmail.com> [Sun, 18 May 2008 17:01:24 +0200] rev 6607
mq: make qselect fail properly on an empty guard
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 17 May 2008 09:11:14 +0200] rev 6606
mq: expand help text for qdiff
Thanks to Waldo for thinking about this and formulating some text.
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:56 -0500] rev 6605
status: refactor status command
- directly calculate a list of states to show
- simplify repo.status call
- use zip to build file list
- only add relevant copies to copy dict
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6604
match: cleanup match classes a bit
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6603
match: remove files arg from repo.status and friends
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6602
match: remove files argument from patch.diff
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6601
match: use match.files() for patch.diff
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6600
match: stop passing files through commitfunc
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6599
status: use match helpers for various users
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6598
churn: simplify hg status call
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6597
match: use helpers for cmdutil
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6596
match: add always, never, and exact methods
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6595
remove default arg from patkind
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6594
resolve: use cmdutil.match
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6593
dirstate: remove default from status list_unknown
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6592
purge: remove unused 'missing' logic
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6591
dirstate: minor status cleanups
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6590
status: rename type_ to state
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6589
walk: use match.bad in statwalk
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6588
walk: use match.dir in statwalk
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6587
walk: make dirstate.walk return a single value too
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6586
walk: return a single value
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6585
walk: remove cmdutil.walk
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6584
walk: remove rel and exact returns
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:08 -0500] rev 6583
walk: remove more old badmatch logic
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6582
walk: remove remaining users of cmdutils.matchpats
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6581
cmdutil: switch commit to match
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6580
walkchangerev: use new match objects
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6579
walk: pass match object to cmdutil.walk
- introduce cmdutil.match
- change args to cmdutil.walk
- create match objects for walk calls
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6578
walk: begin refactoring badmatch handling
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6577
walk: remove files arg from repo.walk and dirstate.walk
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6576
walk: introduce match objects
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6575
walk: kill util.cmdmatcher and _matcher
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6574
purge: use cmdutil.matchpats
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6573
purge: eliminate dopurge
Matt Mackall <mpm@selenic.com> [Mon, 12 May 2008 11:37:07 -0500] rev 6572
walk: eliminate some default variables
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 08 May 2008 18:36:45 +0200] rev 6571
coal: fix CSS errors as reported by Firefox
Benoit Allard <benoit@aeteurope.nl> [Thu, 24 Apr 2008 17:16:02 +0200] rev 6570
add compression type type parameter to bundle command
Benoit Allard <benoit@aeteurope.nl> [Thu, 24 Apr 2008 11:48:07 +0200] rev 6569
add support for HG10GZ bundles to bundlerepo.bundlerevlog()
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 24 Apr 2008 11:43:54 +0200] rev 6568
tests: fix test-highlight output, changed in ccc2481e3954
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 24 Apr 2008 17:15:55 +0200] rev 6567
merge from crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 19 Apr 2008 10:42:30 +0200] rev 6566
rename --after: do not unlink source file (issue910)
"rename --after a.txt A.txt" on case mangling systems (e.g. Windows)
erroneously deleted A.txt (even if modified).
Patrick Mezard <pmezard@gmail.com> [Thu, 24 Apr 2008 13:37:29 +0200] rev 6565
Make mercurial easy installable again
Patrick Mezard <pmezard@gmail.com> [Wed, 23 Apr 2008 22:45:53 +0200] rev 6564
webcommands: pass full author to annotate, fix templates (issue 1054)
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 23 Apr 2008 11:40:33 +0200] rev 6563
sshserver: Don't try to close fp if mkstemp failed
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 18 Apr 2008 18:07:34 +0200] rev 6562
merge from crew-stable
Jason Orendorff <jorendorff@mozilla.com> [Fri, 18 Apr 2008 17:25:10 +0200] rev 6561
mq: fix qdiff -U (it apparently never really worked)
Neal Becker <ndbecker2@gmail.com> [Wed, 16 Apr 2008 15:26:37 -0700] rev 6560
mergetools.hgrc patch
Neal Becker <ndbecker2@gmail.com> [Wed, 16 Apr 2008 15:26:37 -0700] rev 6559
mergetools.hgrc patch
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 16 Apr 2008 16:07:15 +0200] rev 6558
merge from crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 16 Apr 2008 12:15:43 +0200] rev 6557
merge from crew-stable
Wojciech Miłkowski <wmilkowski@interia.pl> [Wed, 16 Apr 2008 12:14:24 +0200] rev 6556
coal: put link fragment at the end of the url (after session vars)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 16 Apr 2008 09:36:24 +0200] rev 6555
merge from crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 16 Apr 2008 16:04:07 +0200] rev 6554
mq: don't commit local changes on pushing empty patch (issue1087)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 16 Apr 2008 12:09:16 +0200] rev 6553
remove trailing spaces
Dirkjan Ochtman <dirkjan@ochtman.nl> [Wed, 16 Apr 2008 09:35:43 +0200] rev 6552
mq: add a little documentation on qpush -f
Adrian Buehlmann <adrian@cadifra.com> [Mon, 14 Apr 2008 00:36:01 +0200] rev 6551
ignore *.pyd files
*.c modules on Windows are compiled to *.pyd
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 23:28:50 +0200] rev 6550
Merge with crew-stable, fix test output
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 23:04:34 +0200] rev 6549
Merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 14 Apr 2008 14:34:38 +0200] rev 6548
replace usage of os.popen() with util.popen()
To make this possible, I added a mode parameter to both implementations of
util.popen(), defaulting to 'r' (as it does in the Python stdlib).
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 23:21:27 +0200] rev 6547
test-merge-internal-tools-pattern: make executable
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:34 +0200] rev 6546
convert: fix svn file copy detection code
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:34 +0200] rev 6545
convert: fix svn branch source detection corner case
It was confused by composite-looking revisions made by copy + remove.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:34 +0200] rev 6544
convert: cleanup svn file copy handling
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:34 +0200] rev 6543
convert: handle past or foreign partial svn copies
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6542
convert: more cleanup in svn directory copy handling
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6541
convert: svn directory copy handling cleanup
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6540
convert: improve subversion branch filtering
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6539
convert: rename get_entry_from_path() into an svn_source method
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6538
convert: fix subpaths detection in svn source
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6537
test-convert-svn-branches: short identifiers are more legible
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6536
cmdutil: handle and warn about missing copy revisions
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6535
localrepo: forbid nullid copyrev
Patrick Mezard <pmezard@gmail.com> [Mon, 14 Apr 2008 22:31:33 +0200] rev 6534
verify: check copy source revlog and nodeid
Matt Mackall <mpm@selenic.com> [Sun, 13 Apr 2008 11:31:45 -0500] rev 6533
Merge with -stable
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Apr 2008 15:14:00 +0200] rev 6532
removing unused local ccache in patch.diff
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Apr 2008 23:05:51 -0400] rev 6531
merge with -stable
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 20:51:26 +0200] rev 6530
merge: replace readline() call, missing from posixfile_nt
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:34:01 +0200] rev 6529
Merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 12 Apr 2008 20:03:54 +0200] rev 6528
remove trailing whitespace introduced in cfeeac24fc1e
Giorgos Keramidas <keramida@ceid.upatras.gr> [Sat, 12 Apr 2008 06:37:38 +0300] rev 6527
templates/coal: spell class correctly in {fileentry}
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:52 -0700] rev 6526
repo: add rjoin method
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:19:51 -0700] rev 6525
parseurl: make revs optional
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:18:38 -0700] rev 6524
Hoist localpath to the top level
Bryan O'Sullivan <bos@serpentine.com> [Fri, 11 Apr 2008 22:17:20 -0700] rev 6523
test-imerge: disable due to massive brokenness
Dov Feldstern <dfeldstern@fastimap.com> [Fri, 04 Apr 2008 02:21:53 +0300] rev 6522
use internal merge tool when specified for a merge-pattern in hgrc
It is possible to specify in the hgrc file that one of the internal merge
tools (internal:fail, internal:local or internal:other) be used for
performing merges on files matching a given pattern. However, this setting
is not being acted upon (the merge tool is not found). This patch fixes that.
Dov Feldstern <dfeldstern@fastimap.com> [Fri, 04 Apr 2008 02:20:58 +0300] rev 6521
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 12 Apr 2008 22:41:07 -0400] rev 6520
fix import with -p0
Patrick Mezard <pmezard@gmail.com> [Sat, 12 Apr 2008 21:08:03 +0200] rev 6519
context: handle untracked files in filectx.fileflags()
Matt Mackall <mpm@selenic.com> [Fri, 11 Apr 2008 12:52:56 -0500] rev 6518
resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 11 Apr 2008 12:04:26 +0200] rev 6517
python-2.6: use sha wrapper from util for new merge code
Adrian Buehlmann <adrian@cadifra.com> [Fri, 11 Apr 2008 09:27:28 +0200] rev 6516
fixed missing sorting in test-dumprevlog
The test failed at random because the order of files was non-deterministic,
which produced diffs in test output.
Patrick Mezard <pmezard@gmail.com> [Fri, 11 Apr 2008 11:21:55 +0200] rev 6515
test-dumprevlog: fix extra path separator under MacOSX
The "find .hg/store/ -name '*.i'" command returned paths with extra separators
like '.hg/store//00changelog.i'.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 11 Apr 2008 08:35:37 +0200] rev 6514
Merge from main.
Paul Moore <p.f.moore@gmail.com> [Thu, 10 Apr 2008 23:07:54 +0200] rev 6513
Add a batch file driver for Windows
Matt Mackall <mpm@selenic.com> [Thu, 10 Apr 2008 15:02:24 -0500] rev 6512
merge: introduce mergestate
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Apr 2008 14:25:50 +0200] rev 6511
Merge with crew-stable.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 10 Apr 2008 14:08:38 +0200] rev 6510
win32text: actually import util so util.binary() can be used
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 16:02:37 -0700] rev 6509
issue 1053: heavily qualify the "cp -al" advice for cloning
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:49:20 -0700] rev 6508
Get rid of reimplementations of util.binary
Christian Ebert <blacktrash@gmx.net> [Tue, 08 Apr 2008 13:19:36 +0200] rev 6507
Let util.binary check entire data for \0 (issue1066, issue1079)
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:12:32 +0200] rev 6506
keyword: check for '\0' in entire data before acting
util.binary might not be safe enough, as it fails eg. on certain
pdf files (issue1066).
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6505
keyword: make overwrite() arguments mandatory
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6504
keyword: compact setting of optional arguments
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:57 +0200] rev 6503
keyword: privatize remaining monkeypatches by moving them into reposetup
Make it more transparent if and when monkeypatches are needed.
Christian Ebert <blacktrash@gmx.net> [Wed, 09 Apr 2008 14:05:56 +0200] rev 6502
keyword: collect filename patterns, wrap dispatch._parse in uisetup
Store [keyword] config in kwtools.
hgcmd defaults to empty string.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:28:30 -0700] rev 6501
Merge
Bryan O'Sullivan <bos@serpentine.com> [Wed, 09 Apr 2008 15:27:57 -0700] rev 6500
Tidy code, fix typo
"Paul Moore <p.f.moore@gmail.com>" [Thu, 20 Dec 2007 20:02:51 +0000] rev 6499
Added hgexecutable support for py2exe/frozen scripts
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Apr 2008 18:40:11 +0200] rev 6498
Remove trailing space
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Apr 2008 18:39:41 +0200] rev 6497
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Apr 2008 15:41:21 +0200] rev 6496
python-2.6: md5 import in test-archive helper
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 08 Apr 2008 15:42:43 +0200] rev 6495
python-2.6: deprecation of GzipFile.filename
Benoit Allard <benoit@aeteurope.nl> [Thu, 10 Apr 2008 14:24:27 +0200] rev 6494
highlight: backward compatibility with pygments 0.5.1
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 08 Apr 2008 18:39:02 +0200] rev 6493
Fix spacing error introduced in 5efd447a9b8d
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Apr 2008 13:16:11 +0200] rev 6492
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 07 Apr 2008 11:59:20 +0200] rev 6491
convert: check svn branches are directories
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 07 Apr 2008 09:26:40 +0200] rev 6490
Merge from crew-stable.
Adrian Buehlmann <adrian@cadifra.com> [Mon, 07 Apr 2008 09:02:26 +0200] rev 6489
tests/test-diff-copy-depth: using sh instead of bash
test failed on plain FreeBSD 6.2 due to nonexistent bash
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Apr 2008 13:13:31 +0200] rev 6488
gendoc: fix indentation
Christian Ebert <blacktrash@gmx.net> [Sun, 06 Apr 2008 13:13:31 +0200] rev 6487
hg.1: bogus escaping of .hg* not needed anymore
Revert ba40e267762b, 1c1ef561d541 workarounds.
Christian Ebert <blacktrash@gmx.net> [Mon, 07 Apr 2008 09:02:04 +0200] rev 6486
doc: escape .hg at bol in manpages with make (issue1072)
This works around a bug in old docbook stylesheets.
Remove .*.swp example from hgignore.5.txt.
Diagnosis and workaround thanks to Alexis S. L. Carvalho.
Isaac Jurado <diptongo@gmail.com> [Sat, 05 Apr 2008 21:29:02 +0200] rev 6485
highlight: Generate pygments style sheet dynamically
This patch allows a per-repository (for example, within a hgwebdir) selection
of pygments_style web option. No static .css files required.
Test edited by pmezard (compatibility fixes)
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 19:33:34 +0200] rev 6484
Merge with macencode branch
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 19:06:16 +0200] rev 6483
win32text: rename forbidcrlforcr() function
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 19:03:45 +0200] rev 6482
test-mactext: simplify test, coverage is ensured by win32text tests
OHASHI Hideya <ohachige@gmail.com> [Thu, 03 Apr 2008 20:41:31 +0900] rev 6481
win32text: Add macencode/macdecode
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 18:19:49 +0200] rev 6480
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Apr 2008 18:15:04 +0200] rev 6479
dirstate: do not ignore current directory '.' (issue 1078)
Christian Ebert <blacktrash@gmx.net> [Sat, 05 Apr 2008 17:48:10 +0200] rev 6478
patchbomb: fix cStringIO import (spotted by pychecker)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 05 Apr 2008 00:11:36 +0200] rev 6477
Make tests/test-dumprevlog executable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 05 Apr 2008 00:04:50 +0200] rev 6476
merge with main
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 23:18:03 +0200] rev 6475
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 23:13:32 +0200] rev 6474
Merge backout
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 23:09:54 +0200] rev 6473
Backed out changeset 7f4257b5cbfc
util.binary heuristic cannot be trusted when decoding working directory files.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 04 Apr 2008 17:44:31 +0200] rev 6472
mq: add --force option to strip
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 04 Apr 2008 22:19:24 +0200] rev 6471
coal: fix some glitches in annotate header
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 04 Apr 2008 22:36:40 +0200] rev 6470
python 2.6 compatibility: compatibility wrappers for hash functions
Paul Moore <p.f.moore@gmail.com> [Fri, 04 Apr 2008 22:41:17 +0200] rev 6469
python 2.6 compatibility: add __hash__ to classes that have __eq__
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 22:18:38 +0200] rev 6468
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Apr 2008 22:15:14 +0200] rev 6467
Let --unified default to diff.unified (issue 1076)
Adrian Buehlmann <adrian@cadifra.com> [Fri, 04 Apr 2008 16:39:44 +0200] rev 6466
contrib: fix binary file issues with dumprevlog on Windows
* Fix traceback on dumprevlog: open revlog in mode 'rb' (binary)
* Set stdio to binary mode so that redirected data is not modified
References:
http://selenic.com/pipermail/mercurial/2008-March/018330.html
http://selenic.com/repo/index.cgi/hg/rev/a3fe91b4f6eb
Adrian Buehlmann <adrian@cadifra.com> [Thu, 03 Apr 2008 17:17:39 +0200] rev 6465
add tests for contrib/dumprevlog and undumprevlog
Matt Mackall <mpm@selenic.com> [Fri, 04 Apr 2008 13:54:49 -0500] rev 6464
coal: minor icon improvements
Matt Mackall <mpm@selenic.com> [Fri, 04 Apr 2008 13:43:25 -0500] rev 6463
coal: more tweaks
- move icons inside links
- set icon borders to 0
- make active menu button white on black and remove bar
Christian Ebert <blacktrash@gmx.net> [Thu, 03 Apr 2008 13:47:05 +0200] rev 6462
pager: make config info accessible with "hg help pager"
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 12:46:37 +0200] rev 6461
tests: easier error diagnostics for test-serve
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 13:21:42 +0200] rev 6460
Merge from crew-stable.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 13:14:43 +0200] rev 6459
hgweb: make hgwebdir work in the absence of PATH_INFO
Thanks to Andrea Arcangeli for reporting and an initial patch.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 11:18:43 +0200] rev 6458
Merge from main.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 03 Apr 2008 11:16:07 +0200] rev 6457
Merge from crew-stable.
Gilles Moris <gilles.moris@free.fr> [Thu, 03 Apr 2008 11:11:31 +0200] rev 6456
Pager extension: switch it off if --debugger is set
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line.
(This supersedes the similar ui.debugflag patch. Disabling
the pager for debug output doesn't make that much sense,
as this is actually when the pager might be useful.)
David Soria Parra <dsp <at> php.net> [Thu, 03 Apr 2008 10:49:42 +0200] rev 6455
Pager extension: switch it off if --debugger is set
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line (Thanks to Gilles Moris).
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:51:06 -0500] rev 6454
coal: even more tweaks
- rearrange file browser columns
- add folder and file icons
- make browse table uniformly monospaced
- use lowercase consistently for column heads
- fix search container div
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:47:19 -0500] rev 6453
coal: more tweaking
- add quirksmode hack in attempt to make MSIE happy
- add container divs for more browsers compatibility
- fix file log button on file page
- link to first line of file source from browser
- change revision navigator style
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:47:17 -0500] rev 6452
coal: more tweaks
- add revision numbers to changeset, browse, and file pages
- add revision number to revision number navigator in log
- remove node from log and filelog pages
- add changeset, browse, and archive buttons back to log page
- make buttons more clickable with display: block
- fix alignment of some table heads
Matt Mackall <mpm@selenic.com> [Wed, 02 Apr 2008 18:47:15 -0500] rev 6451
coal: minor fixes
sans -> sans-serif
tweak column widths
get rid of full changelog
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 02 Apr 2008 21:46:30 +0200] rev 6450
merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Wed, 02 Apr 2008 08:56:38 -0700] rev 6449
test-churn: force COLUMNS to be set
Christian Ebert <blacktrash@gmx.net> [Wed, 02 Apr 2008 14:03:16 +0200] rev 6448
Consistently 1 space after full stops in command doc strings
Update test output accordingly.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Wed, 02 Apr 2008 01:49:29 +0200] rev 6447
patchbomb: Fix mangling of lines beginning with From
we should mangle the lines beginning with From only when writing
to mbox format.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Apr 2008 14:35:35 +0200] rev 6446
asciidoc: consistently use 1 space after full stop
Note: the command doc strings included in hg (1) are still
inconsistent wrt to spaces after full stops.
Christian Ebert <blacktrash@gmx.net> [Tue, 01 Apr 2008 14:35:11 +0200] rev 6445
hgrc.5: fix subsection formatting
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 01 Apr 2008 16:36:25 +0200] rev 6444
imported patch templ.diff
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Apr 2008 10:19:49 +0200] rev 6443
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Apr 2008 08:34:23 +0200] rev 6442
merge with crew-stable
Brendan Cully <brendan@kublai.com> [Mon, 31 Mar 2008 23:02:25 -0700] rev 6441
rollback: unlink files truncated to length 0
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 02 Apr 2008 21:45:35 +0200] rev 6440
make test-diff-copy-depth executable
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Tue, 01 Apr 2008 09:17:11 +0200] rev 6439
convert: fix test-convert-svn-* problems with mtime not changing
The `svn commit` command does not detect changed files unless
their mtime has changed. A quick succession of, for instance,
`svn co ...; echo x >> y; svn ci` can thus lead to the change to y
being ignored.
Edited by pmezard to write in binary mode.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Apr 2008 08:33:17 +0200] rev 6438
merge with hg-stable
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 23:14:25 -0500] rev 6437
hgweb: fix merge breakage
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:36 -0500] rev 6436
templates: add coal web theme
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:34 -0500] rev 6435
optimize PNGs
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:33 -0500] rev 6434
hgweb: minor improvements for new web style
- make renamelink take a context
- pass current node to shortlog page rather than tip
- pass user/desc/date/rename to filediff
- improve template error reporting for foo%bar
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:32 -0500] rev 6433
add simple dump and undump scripts to contrib/
Matt Mackall <mpm@selenic.com> [Mon, 31 Mar 2008 21:49:26 -0500] rev 6432
Merge with stable
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6431
copies: refactor symmetricdifference as _findlimit
We only need to track the lowest revision seen, which makes things simpler.
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6430
copies: teach symmetric difference about working revisions
- use changelog.count() as a pseudo revision number
- abort early in copies if revs are the same
- eliminate working dir hacks in copies
- yield results as they're found
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6429
symmetricdifference: move back to copies
It's too tightly dependent on known revlog ordering to fit well in ancestors
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6428
symmetricdifference: change colors to sides
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6427
ancestors: simplify symmetric difference
- n_wanted/wanted -> interesting
- scan colors rather than managing ret
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6426
copies: don't double-detect items in the directory copy check
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6425
copies: skip directory rename checks when not merging
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6424
copies: sort old names by depth
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6423
backout: reverse changeset belongs on current branch
Backing out a changeset that is before a named branch branchpoint was
making the reverse changeset the tip of the old branch, which is wrong
and very confusing. So instead, we put it on the current named branch.
Matt Mackall <mpm@selenic.com> [Sat, 29 Mar 2008 12:39:47 -0500] rev 6422
copies: fix silly precedence bug
Kirill Smelkov <kirr@mns.spb.ru> [Fri, 28 Mar 2008 11:17:10 +0300] rev 6421
churn: allow whitespaces as delimiter in aliases
it was exactly on space character before.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 31 Mar 2008 18:49:15 +0200] rev 6420
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Mon, 31 Mar 2008 18:44:12 +0200] rev 6419
hg serve: add clearer message when starting the server with --verbose
Explicitly tell the address is the one the process is bound to.
Fix the printing of IPv6 addresses.
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 31 Mar 2008 13:10:47 +0200] rev 6418
convert: fix trailing space introduced in 5efd447a9b8d
David Soria Parra <dsp <at> php.net> [Sat, 29 Mar 2008 19:41:50 +0100] rev 6417
pager: Add a configuration to enable/disable the pager for certain commands
Add the configuration options pager.ignore and pager.attend.
You can disable the pager on certain commands by adding them to the
pager.ignore setting. To whitelist commands, you can add them to pager.attend.
To disable or enable global commands like 'hg version' or 'hg help'
you have to use your global .hgrc. (thanks, Matt Mackall)
Christian Ebert <blacktrash@gmx.net> [Mon, 31 Mar 2008 11:08:52 +0200] rev 6416
keyword: regroup monkey patch code, underscore prefix private vars
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 31 Mar 2008 00:01:27 +0200] rev 6415
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Mar 2008 23:58:02 +0200] rev 6414
Fix test-convert-svn-tags on case sensitive filesystems
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 22:29:02 +0200] rev 6413
fix bug introduced by 2540521dc7c1 (thanks pychecker)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 22:23:55 +0200] rev 6412
merge with -stable
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 20:21:46 +0200] rev 6411
fix error spotted by pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 22:22:53 +0200] rev 6410
fix bug introduced by 894875eae49b (short not defined)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 20:31:35 +0200] rev 6409
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 20:21:57 +0200] rev 6408
fix warning from pychecker
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 30 Mar 2008 20:21:46 +0200] rev 6407
fix error spotted by pychecker
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Mar 2008 20:25:22 +0200] rev 6406
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sun, 30 Mar 2008 20:18:40 +0200] rev 6405
commands: fix shadowed repo module
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 29 Mar 2008 21:15:54 +0100] rev 6404
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 29 Mar 2008 21:15:34 +0100] rev 6403
hgweb: remove dead code
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:27:35 +0100] rev 6402
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:16:39 +0100] rev 6401
test-convert-svn-source: remove redundant tests
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:16:18 +0100] rev 6400
convert: allow tags detection to be disabled
Tags calculation becomes more reliable but slower, measurable on frequent
synchronizations.
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:15:45 +0100] rev 6399
convert: follow svn tags history (issue953)
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:15:43 +0100] rev 6398
Add a test for svn tags conversion
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:14:53 +0100] rev 6397
convert: avoid svn log retrieval process cleanup
With huge history (like kdelibs), the process termination suddenly consumes a
lot of memory (from 700M to 1.3G+). Since the job is done, clean termination is
not required, just exit.
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Mar 2008 17:14:47 +0100] rev 6396
test-convert-mtn: test directory deletion
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 28 Mar 2008 19:47:22 +0100] rev 6395
fix const annotation warning
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 17:31:50 +0100] rev 6394
highlight: some small cleanups
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 19:40:44 +0100] rev 6393
hgweb: refactor hgweb code
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 28 Mar 2008 19:37:28 +0100] rev 6392
hgweb: separate out utility functions
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 24 Mar 2008 18:18:39 +0100] rev 6391
Backed out changeset d2bb66a8a435 (temporary template compatibility)
Bryan O'Sullivan <bos@serpentine.com> [Thu, 27 Mar 2008 12:52:41 -0700] rev 6390
mercurial.el: note new Emacs VC mode support
Bryan O'Sullivan <bos@serpentine.com> [Wed, 26 Mar 2008 10:12:10 -0700] rev 6389
manifest: improve parsing performance by 8x via a new C extension
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 18:05:30 -0500] rev 6388
Added signature for changeset bae2e9c838e9
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 18:05:22 -0500] rev 6387
Added tag 1.0 for changeset bae2e9c838e9
Bryan O'Sullivan <bos@serpentine.com> [Mon, 24 Mar 2008 15:50:58 -0700] rev 6386
Tests for issue 1049
Bryan O'Sullivan <bos@serpentine.com> [Mon, 24 Mar 2008 15:36:56 -0700] rev 6385
commit: when committing the results of a merge, it's all or nothing
Previously, it was possible to commit just one file from a merge, which
is essentially always the wrong thing to do. This fixes issue 1049.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Mar 2008 22:49:33 +0100] rev 6384
Skip older monotone versions for tests.
test-convert-mtn is known to work with 0.37 and 0.38, but fails with
0.31 (Debian etch). hghave now skips all versions up to 0.31.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Mar 2008 22:09:01 +0100] rev 6383
run-tests.py: Only one fail message when output changed and error code.
This fixes passing back fail messages mistaken for skip messages when
running with parallel jobs because run_children() only expects one message per
fail.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 18:07:07 -0300] rev 6382
mq: use repo.changelog.tip() instead of the "tip" tag
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 24 Mar 2008 20:28:13 +0100] rev 6381
Fix missing space in one of the new update messages.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 16:17:19 -0300] rev 6380
qclone: do not abort if remote hasn't enabled mq (issue1040)
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 24 Mar 2008 13:45:01 -0300] rev 6379
hgweb: add compatibility code for old templates
Up to changeset 3340aa5a64f7, HTTP headers were expected to be embedded
in the "headers" template. Since that changeset, the content-type is
supposed to be defined as the "mimetype" template in the map file.
This changeset makes sure the old templates still work.
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 11:12:57 -0500] rev 6378
Merge with crew
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:31 +0100] rev 6377
test-convert-mtn: test directory move
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Mar 2008 17:02:08 +0100] rev 6376
convert: record deleted files in monotone source
Matt Mackall <mpm@selenic.com> [Mon, 24 Mar 2008 10:01:05 -0500] rev 6375
update: better logic and messages for updates
- complain about attempts to merge with ancestor
- when updating, differentiate between
- crossing named branches with no local changes (jump)
- crossing named branches with local changes (complain)
- nonlinear update on the same named branch, no changes (complain some more)
- nonlinear update on the same named branch, changes (different complaining)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Mon, 24 Mar 2008 16:20:15 +0100] rev 6374
hgweb: fix breakage in python < 2.5 introduced in 2c370f08c486
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:35:57 -0300] rev 6373
setup.py: hide compiler error messages while searching for inotify
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 23:18:20 +0100] rev 6372
Add a test for monotone conversion
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:03:24 -0300] rev 6371
don't use hasattr in repo.invalidate
hasattr ends up calling __getattr__ which will instantiate the very
attributes we want to remove.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:03:24 -0300] rev 6370
localrepo.commit: grab locks before getting the list of files to commit
Somebody may change the dirstate after we've determined the parents of
the working dir and run repo.status, but before we called wlock().
This should also fix issue997, where backout would change a file without
changing its size and then call repo.commit without passing the list of
files. If this happened in less than one second, we wouldn't detect any
file changes - the in-memory dirstate still has the cached stat data for
that file. Grabbing the wlock early causes the dirstate to be
invalidated and we end up reading the dirstate file again, which has
that file marked for lookup (size == -1).
A better fix would be for backout to give repo.commit the exact list of
files, but that'll require some changes to the revert operation.
A significant user-visible change is that the precommit hook is always
run with both locks grabbed - previously, hg commit would run it before
grabbing any locks, but hg import would run it after grabbing locks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 23 Mar 2008 21:03:24 -0300] rev 6369
Avoid calling heads() twice on every hg commit.
In an extreme case (merging two revisions with very low revision numbers)
this could be slower than the previous code, but it should be much faster
in the usual cases (parents are near the tip). It also avoids some races
in some uninteresting cases (e.g. two concurrent hg commits).
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sun, 23 Mar 2008 23:08:18 +0100] rev 6368
hgweb: better error messages
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 22:15:47 +0100] rev 6367
Remove unexpected "Alternately" word from tip help.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 23 Mar 2008 21:48:38 +0100] rev 6366
run-tests.py: Allow environment variables to set jobs/timeout/port.
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 21:41:03 +0100] rev 6365
convertrepo: make it work with refactored convert extension
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 21:40:27 +0100] rev 6364
Make tip help more helpful
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 20:37:04 +0100] rev 6363
test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 20:37:02 +0100] rev 6362
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 18:52:02 +0100] rev 6361
hgk: display orphan revisions content (issue 1041)
Patrick Mezard <pmezard@gmail.com> [Sun, 23 Mar 2008 16:07:27 +0100] rev 6360
test-mq-symlinks: skip if symlinks are not supported
Florent Guillaume <fg@nuxeo.com> [Sun, 23 Mar 2008 01:23:03 +0100] rev 6359
test-notify: make it pass on Mac OS X 10.5
Florent Guillaume <fg@nuxeo.com> [Sun, 23 Mar 2008 01:13:56 +0100] rev 6358
test-remove: make tests really pass
Ah, the joys of cross-platform shell scripting...
Florent Guillaume <fg@nuxeo.com> [Sun, 23 Mar 2008 01:04:51 +0100] rev 6357
test-remove: fix for non-gnu find
Florent Guillaume <fg@nuxeo.com> [Sat, 22 Mar 2008 21:13:22 +0100] rev 6356
test-remove: make it pass on Mac OS X 10.5
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 20:16:30 +0100] rev 6355
tests: add highlight extension tests
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 18:33:10 +0100] rev 6354
tests: add tests for hgweb to test-keyword
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 20:15:30 +0100] rev 6353
Merge main and crew.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 22 Mar 2008 20:03:00 +0100] rev 6352
removed trailing spaces
Matt Mackall <mpm@selenic.com> [Sat, 22 Mar 2008 13:50:59 -0500] rev 6351
ui: disallow newlines in usernames (issue1034)
Matt Mackall <mpm@selenic.com> [Sat, 22 Mar 2008 13:30:08 -0500] rev 6350
update: no -C needed to switch branches without outstanding changes
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Mar 2008 19:01:09 +0100] rev 6349
coverage: deal with symlinked input paths (MacOSX issue)
/tmp is symlinked in MacOSX therefore test scripts as well as python modules
are installed in a symlinked location. coverage.py uses abspath() to normalize
its inputs which fails if these are referencing real paths. Use realpath()
instead.
Patrick Mezard <pmezard@gmail.com> [Sat, 22 Mar 2008 18:01:46 +0100] rev 6348
Make churn an official extension
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 12:48:15 +0100] rev 6347
tiny tab cleanup
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 22 Mar 2008 10:07:49 +0100] rev 6346
improved semantics for remove (issue438)
- Added files are never deleted (only removed with --force).
- Modified files can only be removed with --force.
- With --after, only deleted files are removed.
- With --after --force, all files are removed but not deleted.
Matt Mackall <mpm@selenic.com> [Fri, 21 Mar 2008 17:22:47 -0500] rev 6345
test: fix mixing exec bit on test-hgwebdirsym
Matt Mackall <mpm@selenic.com> [Fri, 21 Mar 2008 15:57:22 -0500] rev 6344
tests: make test-rebuildstate repeatable
Matt Mackall <mpm@selenic.com> [Fri, 21 Mar 2008 15:57:22 -0500] rev 6343
tests: teach -i about fails list
Matt Mackall <mpm@selenic.com> [Fri, 21 Mar 2008 15:57:22 -0500] rev 6342
tests: make test-convertcvs repeatable
Eric Hopper <hopper@omnifarious.org> [Fri, 21 Mar 2008 08:46:15 -0700] rev 6341
test: Add tests for webdir symlinks and walkrepos.
Matt Mackall <mpm@selenic.com> [Fri, 21 Mar 2008 15:44:11 -0500] rev 6340
mq: warn when applying a patch to somewhere other than tip
Patrick Mezard <pmezard@gmail.com> [Fri, 21 Mar 2008 21:56:55 +0100] rev 6339
util: check fileno() validity in win32 set_binary()
Adrian Buehlmann <adrian@cadifra.com> [Fri, 21 Mar 2008 14:52:24 +0100] rev 6338
clone: print "updating working directory" status message
With this change, "hg clone" looks like this:
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
So the user sees
% hg clone http://example.com/repo/big big
requesting all changes
adding changesets
adding manifests
adding file changes
added XXX changesets with XXX changes to XXX files
updating working directory
while Mercurial is writing to disk to populate the working directory
With this change, "hg clone" looks like this:
% hg clone big big-work
updating working directory
XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 21 Mar 2008 12:05:01 +0100] rev 6337
give better error message on non-existent mapfile (issue813)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 21 Mar 2008 11:06:02 +0100] rev 6336
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 21 Mar 2008 00:55:53 +0100] rev 6335
hgweb: only accept POST requests for unbundle
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 21 Mar 2008 00:39:39 +0100] rev 6334
tab/space cleanup
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Mar 2008 22:46:35 +0100] rev 6333
ui: copy overlay from both direct and indirect parentui
Patrick Mezard <pmezard@gmail.com> [Thu, 20 Mar 2008 23:32:43 +0100] rev 6332
convert: allow missing tools not to stop source type detection
Dirkjan Ochtman <dirkjan@ochtman.nl> [Thu, 20 Mar 2008 22:58:53 +0100] rev 6331
fix test-serve breakage for other hostnames
Patrick Mezard <pmezard@gmail.com> [Thu, 20 Mar 2008 22:41:40 +0100] rev 6330
util: test fileno() availability in win32 set_binary()
Fix suggested by Alexander Belchenko <bialix@ukr.net>
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 15:59:54 -0500] rev 6329
tests: fix repeatability for test-filebranch with dirstate granularity
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 14:14:15 -0500] rev 6328
tests: remove some unnecessary sleeps
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 13:53:59 -0500] rev 6327
dirstate: refactor granularity code, add a test
- rename option dirstate.granularity
- move option reading into .write()
- add a simple test
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Mar 2008 17:55:21 -0300] rev 6326
dirstate: ignore stat data for files that were updated too recently
This should fix the race where
hg commit foo
<change foo without changing its size>
happens in the same second and status is fooled into thinking foo
is clean.
A configuration item is used to determine the timeout, since different
filesystems may have different requirements (I think VFAT needs 3s,
while most Unix filesystems are fine with 1s).
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6325
pager: remove pager code from core
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6324
pager: further simplify code, clean up comments
David Soria Parra <dsp@php.net> [Thu, 20 Mar 2008 00:57:14 +0100] rev 6323
Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.
Two configuration variables are available to influence the
behaviour of the pager:
pager.application
sets the application to be used
pager.quiet
silences Broken Pipe errors that might occur when the user
quits the pager before mercurial finished to write the output
Dennis Schoen <ds@1d10t.de> [Wed, 16 Jan 2008 11:50:24 +0100] rev 6322
hgk: don't exit if mercurial commands only print warnings
John Coomes <john.coomes@sun.com> [Fri, 14 Mar 2008 15:38:56 -0700] rev 6321
tag: allow multiple tags to be added or removed
- Example: "hg tag -r 42 build-25 beta-1" will add tags build-25 and beta-1
for rev 42.
- The deprecated and undocumented usage "hg tag arg1 arg2" used to emit a
warning, then add tag arg1 for rev arg2 (equivalent to "hg tag -r arg2 arg1").
It will now add tags arg1 and arg2 for the current revision.
- If one tag triggers an error, no tags are added/removed (all or nothing).
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 17 Mar 2008 19:28:46 +0200] rev 6320
tests: update test-command-template for the new {isodatesec} filter
Giorgos Keramidas <keramida@ceid.upatras.gr> [Mon, 17 Mar 2008 19:17:54 +0200] rev 6319
Add an {isodatesec} template, to show seconds too.
Eric Hopper <hopper@omnifarious.org> [Mon, 17 Mar 2008 12:41:14 -0700] rev 6318
convert: Add convert.cvsps option to set up an alternate cvsps command line.
Eric Hopper <hopper@omnifarious.org> [Mon, 17 Mar 2008 12:40:02 -0700] rev 6317
hgwebdir: Tiny fix for webdir on non-symlink capable platforms.
John Mulligan <phlogistonjohn@asynchrono.us> [Sat, 15 Mar 2008 12:22:15 -0400] rev 6316
Add tests for cloning from a all-history bundle
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6315
clone: use cancopy
John Mulligan <phlogistonjohn@asynchrono.us> [Sat, 15 Mar 2008 12:04:28 -0400] rev 6314
Add ability to directly clone from all-history bundles
bundlerepos can be used as clone src, even if CWD is not a repo
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6313
remoterepo: no longer needed
All users already use repo.local() to test for local, which is false
in the repository base class. statichttprepository never derived from
this class anyway.
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6312
repo classes: remove unused dev() method
John Mulligan <phlogistonjohn@asynchrono.us> [Sat, 15 Mar 2008 15:23:20 -0400] rev 6311
Add default local() and cancopy() methods to repository base class
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Fri, 07 Mar 2008 16:19:46 +0100] rev 6310
make hgrc man page tell about ~/.hgrc on Windows
"Peter Arrenbrecht" <peter.arrenbrecht@gmail.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6309
ui: make chuild ui feed output to parentui's active buffer
Matt Mackall <mpm@selenic.com> [Thu, 20 Mar 2008 11:12:35 -0500] rev 6308
convert: fix test complaint for mtn bits
Mikkel Fahnøe Jørgensen <mikkel@dvide.com> [Sun, 03 Feb 2008 16:14:05 +0100] rev 6307
cleanup monotone conversion and use commandline class
Mikkel Fahnøe Jørgensen <mikkel@dvide.com> [Sat, 02 Feb 2008 19:14:59 +0100] rev 6306
initial version of monotone source for convert extension
Benoît Allard <benoit@aeteurope.nl> [Thu, 20 Mar 2008 16:42:51 +0100] rev 6305
notify: print diffstat even if maxline == 0
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 20 Mar 2008 01:47:35 +0100] rev 6304
Make clear that for a changegroup '-r' pulls "up to" a revision
If some better wording is found, it can be changed later.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Wed, 19 Mar 2008 16:54:35 -0300] rev 6303
two fixes for the pager stuff
- open pipe in binary mode
- don't start a pager if stdout is not a tty (this prevents test-ssh
from hanging if you set ui.usepager=True in run-tests.py)
David Soria Parra <dsp@php.net> [Tue, 18 Mar 2008 22:12:34 +0100] rev 6302
Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.
Two configuration variables are available to influence the behaviour of the
pager. ui.pager sets the pager application. The pager is
only used if ui.usepager is true. By default ui.usepager is disabled.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 18:14:59 -0300] rev 6301
Fix thinko in test-inherit-mode
If we don't change any rwx bit in the last test, hg will skip the
calls to chmod since it'll assume they're not needed.
This might fix things on BSD systems.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 16:15:43 +0100] rev 6300
test-serve: replace copy/paste with shell function
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6299
revert: update state of files in the "checkout" list
This can make a difference when there are filters involved and
decode(encode(working-dir-data)) != working-dir-data
even though
encode(decode(repo-data)) == repo-data
An example is a working dir file that uses only \n when you're using
the win32text extension.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6298
normallookup: during merges, restore the state saved by remove
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6297
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Tue, 18 Mar 2008 04:07:39 -0300] rev 6296
debugstate: add --nodates
This can be useful for tests.
Patrick Mezard <pmezard@gmail.com> [Mon, 17 Mar 2008 23:36:45 +0100] rev 6295
patch: fix corner case with update + copy patch handling (issue 937)
The self patching of files when diffed with a backup is a bit peculiar to me.
It makes sense in mpatch, that's less clear in mercurial patching code. Let's
document and preserve it for now.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:41 -0700] rev 6294
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 14:51:36 -0700] rev 6293
Backed out changeset 4b81eecc8aa2
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 08:04:09 -0700] rev 6292
Merge
Bryan O'Sullivan <bos@serpentine.com> [Mon, 17 Mar 2008 07:59:23 -0700] rev 6291
Backed out changeset 91ac1726730a
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:31 -0700] rev 6290
Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Sun, 16 Mar 2008 22:59:04 -0700] rev 6289
issue 1003: send all data properly
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:30:47 +0100] rev 6288
Remove unneeded "import os.path" again.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 16 Mar 2008 23:24:53 +0100] rev 6287
Spacing cleanup
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 16 Mar 2008 06:10:47 -0300] rev 6286
filectx.ancestor: use fctx._repopath to cache filelogs (issue1035)
_repopath may be different from _path for workingfilectx when there
are renames involved.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:41 -0700] rev 6285
Change User-agent field in client to have a lot more info.
Eric Hopper <hopper@omnifarious.org> [Sat, 15 Mar 2008 12:42:34 -0700] rev 6284
Allow hgwebdir collections to follow symlinks.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6283
Revert cfebb175704f, fixing the output of 2 tests
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 15 Mar 2008 22:03:18 -0300] rev 6282
test-mv-cp-st-diff: avoid linkrev collisions
The copy detection code relies heavily on the linkrevs, so it's better
to avoid collisions in this test.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:14 +0100] rev 6281
convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
Patrick Mezard <pmezard@gmail.com> [Sun, 16 Mar 2008 00:35:12 +0100] rev 6280
patch: check filename is /dev/null for creation or deletion (issue 1033)
Otherwise, file creation or deletion is ambiguous with file being filled or
emptied.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:51:53 -0500] rev 6279
update tests for copy detection changes
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:49:27 -0500] rev 6278
copies: add tests for status -C/diff --git
This goes through 42 combinations of copy/rename branch/parent/working dir.
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:25:27 -0500] rev 6277
copies: deal with symmetric difference for linear relationships
choose the minimum of symmetric difference and the two revs in question
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 16:24:16 -0500] rev 6276
status: find copies and renames beyond the working directory
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6275
diff: use copy smarts from copies.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6274
copies: move findcopies code to its own module
- pass in contexts
- fold symmetricdifference check into copies.copies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6273
merge: move symmetricdifferences to ancestor.py
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6272
merge: simplify some helpers
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6271
merge: more simplifications to checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6270
merge: simplify checkcopies
Matt Mackall <mpm@selenic.com> [Sat, 15 Mar 2008 10:02:31 -0500] rev 6269
merge: privatize some functions, unnest some others
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 11:01:31 -0500] rev 6268
merge: notice uncommited copies (issue1000)
As mentioned in msg5349 in issue988, "hg update" doesn't take into account
uncommitted copies. To reproduce:
----------------
hg init repo
cd repo
touch foo
hg ci -Am 'add foo'
echo >> foo
hg ci -m 'change foo'
hg up -C 0
hg mv foo bar
HGMERGE=false thg --debug -y update
--------------------------
A similar problem happens with hg merge --force.
I'm attaching a possible patch.
Eric Hopper <hopper@omnifarious.org> [Sun, 02 Mar 2008 08:51:02 -0800] rev 6267
Check for patches repo with os.path.isdir not os.path.exists
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 21:57:46 -0300] rev 6266
hook.py: fix redirections introduced by 323b9c55b328
The only non-obvious part is the use of sys.{__stderr__,__stdout__},
which is needed because sshserver overrides sys.stdout.
This makes a test that I added back in revision 7939c71f3132 ineffective.
Jesse Glick <jesse.glick@sun.com> [Mon, 25 Feb 2008 09:55:57 -0500] rev 6265
Issue937: error messages from hooks not sent over HTTP.
Turns out that stderr - where ui.warn would send messages - was not
being proxied over the HTTP connection. stdout was, and it seems you
need both. (The streams are interleaved for readability.)
Tested on Ubuntu 7.10 with lighttpd on hgweb.cgi with HTTP Basic auth,
no SSL, using a changeset failing win32text.forbidcrlf.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 20:01:50 -0300] rev 6264
revlog.py: remove extra close()
atomictempfile.rename() already calls close().
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 14 Mar 2008 23:51:58 +0100] rev 6263
adjust test-http output to non-default HGPORT, e.g. with run-tests.py -j
Stephen Deasey <sdeasey@gmail.com> [Mon, 10 Mar 2008 19:25:34 +0000] rev 6262
hgweb: clarify which address and port can/cannot be bound at startup (bug 769)
The error message at startup when the address/port could not be bound
was confusing:
hg serve
abort: cannot start server: Address already in use
Be more explicit:
$ hg serve -a localhost
abort: cannot start server at 'localhost:8000': Address already in use
Also be more explicit on success, showing hostname and ip address/port:
$ hg -v serve -a localhost -p 80
listening at http://localhost/ (127.0.0.1:80)
We are careful to handle a missconfigured machine whose hostname does not
resolve, falling back to the address given at the command line.
Remove a dead-code error message.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 22:12:50 +0100] rev 6261
revlog: make sure the files are closed after an exception happens
This prevents a corruption when the writes happen after the truncate
initiated by the transaction rollback.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 21:36:09 +0100] rev 6260
merge with crew
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 14 Mar 2008 21:35:49 +0100] rev 6259
make sure not to reuse an existing append-file from a previous failed pull
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 10:32:19 -0300] rev 6258
Fix issue995 (copy --after and symlinks pointing to a directory)
I haven't looked at other places that call os.path.isdir to make
sure they're OK.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6257
dirstate: ignore mode changes if the fs does not supports the exec bit
This can make a difference when e.g. the repo is exported through NFS
(which support exec bits) and CIFS (which does not).
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6256
merge: require --force when there are deleted files
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6255
add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6254
localrepo.commit: normalize commit message even for rawcommit.
This normalization consists of:
- stripping trailing whitespace
- always using "\n" as the line separator
I think the main reason rawcommit was skipping this normalization was
an attempt to preserve hashes during an hg->hg conversion.
While this is a nice goal, it's not particularly interesting in
practice. Since SHA-1 is so strong, the only safe way to do it is to
have absolutely identical revisions. But:
- if the original revision was created with a recent version of hg,
the commit message will be the same, with or without that
normalization
- if it was created with an ancient version of hg that didn't do any
normalization, even if the commit message is identical, the file list
in the changelog is likely to be different (e.g. no removed files),
and there were some old issues with e.g. extra file merging, which
will end up changing the hash anyway
- in any case, if one *really* has to preserve hashes, it's easier
(and faster) to fake a partial conversion using something like:
hg clone -U -r rev orig-repo new-repo
hg -R new-repo log --template '#node# #node#\n' > new-repo/.hg/shamap
Additionally, we've had some reports of problems arising from this lack
of normalization - e.g. issue871, and a user that was wondering why
hg export/hg import was not preserving hashes when there was nothing
unusual going on (it was just import doing the normalization that had
been skipped).
This also means that it's even more unlikely to get identical revisions
when going $VCS->hg->$VCS.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6253
debugancestor: use repo.lookup when no revlog was specified
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 09:56:58 -0300] rev 6252
update output of test-hgweb
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Fri, 14 Mar 2008 01:45:17 -0300] rev 6251
setup.py: use a simplified custom version of CCompiler.has_function
The original one doesn't remove its temporary files and even creates
a temporary file in the CWD.