Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:43:55 +0100] rev 5805
test-convert: test before() and after() conversion actions
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:43:55 +0100] rev 5804
test-convert-svn-source: test convert/multiple extra fields
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:43:49 +0100] rev 5803
Merge with crew-stable
Bryan O'Sullivan <bos@serpentine.com> [Fri, 04 Jan 2008 13:56:31 -0800] rev 5802
util: drop params added during experimentation
John Coomes <john.coomes@sun.com> [Tue, 18 Dec 2007 12:45:30 -0800] rev 5801
hg tag: run tag hook just once
Patrick Mezard <pmezard@gmail.com> [Sat, 05 Jan 2008 17:55:16 +0100] rev 5800
Make run-tests.py --interactive work on Windows
Patrick Mezard <pmezard@gmail.com> [Fri, 04 Jan 2008 23:23:47 +0100] rev 5799
convert: filemap must call base converter before()/after() actions
Bryan O'Sullivan <bos@serpentine.com> [Fri, 04 Jan 2008 11:58:27 -0800] rev 5798
fetch: hide authentication details
Bryan O'Sullivan <bos@serpentine.com> [Fri, 04 Jan 2008 11:52:24 -0800] rev 5797
serve: Don't change directory in the child if invoked with -d and --cwd
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 04 Jan 2008 14:25:04 +0100] rev 5796
Fix status char in color extension for deleted (missing) files.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 04 Jan 2008 07:44:07 +0100] rev 5795
merge with main
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 03 Jan 2008 06:25:30 +0900] rev 5794
convert: print commit log message with local encoding correctly.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 03 Jan 2008 06:25:30 +0900] rev 5793
convert: Accept local path on win32.
Kevin Christen <kevin.christen@gmail.com> [Thu, 03 Jan 2008 20:27:32 -0600] rev 5792
color extension: change from GPL3 to 2
Matt Mackall <mpm@selenic.com> [Thu, 03 Jan 2008 13:46:39 -0600] rev 5791
changelog: fix decoding of extra
(spotted by pmezard)
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 03 Jan 2008 06:25:30 +0900] rev 5790
convert: svn_sink: workaround of command line size limitation on win32.
On win32, the command line arguments seems to be limited about 2400
bytes. So 'add', 'delete', 'propget' and 'propdel' operations are
called several times within this limitation. And also 'commit'
operation is changed to be called without passing target files not to
exceeds this limitation because it cannot be a separated like other
operations above.
Shun-ichi GOTO <shunichi.goto@gmail.com> [Thu, 03 Jan 2008 06:25:30 +0900] rev 5789
convert: svn_sink: specify encoding of message file explicitly on commit.
Peter Arrenbrecht <peter.arrenbrecht@gmail.com> [Wed, 02 Jan 2008 16:24:13 +0100] rev 5788
mq: add --currentdate and --date options to qnew and qrefresh
These options make qnew add and qrefresh update a "# Date "-style
header line. This allows proper recording of creation / last
modification dates of patches in patch queues.
Note that `qrefresh -D` only updates existing header lines. It never
adds them, and does not warn about this. This is because I expect
people to have `[default] qrefresh -D` in their .hgrc so patches with
tracked dates get updated, others are left unchanged. The suggested
setup in .hgrc is, in fact,
[default]
qnew = -D -U
qrefresh = -D
I tried to not mix header styles, so `qnew -D -U` now writes the user in
"# User "-style, while `qnew -U` still writes it "From: "-style. Also, if
`qrefresh -U` must add the user, it does so in "# User "-style if the
header contains a "# HG changeset patch" line. (This is caused by mq
not supporting the "Date: "-style header line at all - a reasonable choice
given its standard date format.)
Kevin Christen <kevin.christen@gmail.com> [Mon, 31 Dec 2007 09:15:39 -0600] rev 5787
Add colored output to status and qseries commands
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Dec 2007 14:43:03 +0100] rev 5786
patchbomb: simplify some line continuations
Christian Ebert <blacktrash@gmx.net> [Sun, 30 Dec 2007 14:24:03 +0100] rev 5785
patchbomb: add linebreaks after colons (coding style)
Kevin Christen <kevin.christen@gmail.com> [Thu, 03 Jan 2008 13:39:26 -0600] rev 5784
Fixed XHTML validation errors
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 02 Jan 2008 20:22:10 +0100] rev 5783
Move aliases section in help below synopsis (issue362)
This should avoid confusion why e.g. "hg help co" shows help
for "hg update" instead.
Patrick Mezard <pmezard@gmail.com> [Tue, 01 Jan 2008 23:12:48 +0100] rev 5782
test-convert-svn-source: test stop revision
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Jan 2008 19:20:03 +0100] rev 5781
Sort commands table again and add some missing 'hg' in synopsises.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Jan 2008 17:12:37 +0100] rev 5780
Obfuscate (instead of just escape) contact/owner in gitweb summary.
This could contain an email address.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Jan 2008 17:07:15 +0100] rev 5779
Don't let ui.username override web.contact (issue900)
4603eef60237 introduced using ui.username before web.contact, but this was
never documented and might cause commit accidents.
- Drop web.author (deprecated since 2005)
- Try ui.username or $EMAIL as a fallback to display something useful.
- Update docs for the fallbacks.
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 01 Jan 2008 11:19:15 +0100] rev 5778
realign commands table
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5777
bisect: improve tests
- test skipping
- test noupdate
- test bad->good search
- test inconsistent state
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5776
bisect: handle search for bad to good transitions
Automatically detect whether we're looking for a bad to good
transition rather than the usual good to bad transition by detecting
when badrev is inside the good set and flipping good/bad.
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5775
bisect: make bisect a built-in command
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5774
bisect: faster merging
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5773
bisect: merge ancestor lists when pushing to children
- eliminate some redundant tests and assignments
- move ancestor list merging to child update
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5772
bisect: skip calculations on candidates with too many ancestors
Once an ancestor list has grown past the perfect threshold, all
descendants are less optimal. Use a poison dict to avoid pointless
operations on their long ancestor lists, thus eliminating most of the
work.
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5771
bisect: stop early if we find a perfect candidate
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:34 -0600] rev 5770
bisect: find best node in ancestor collection pass
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:33 -0600] rev 5769
bisect: calculate candidate set while finding children
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:33 -0600] rev 5768
bisect: use a dict for children
We fill in the children only for ancestors of badrev
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:33 -0600] rev 5767
bisect: propagate ancestor lists directly to children
- calculate the children of all candidates
- for each candidate, combine ancestor lists
- pass ancestor lists to children
- store ancestor count
This eliminates the O(n**2) memory usage, while maintaining about the
same performance.
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:33 -0600] rev 5766
bisect: add noupdate option
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 18:20:25 -0600] rev 5765
Merge backout
Matt Mackall <mpm@selenic.com> [Mon, 31 Dec 2007 17:47:02 -0600] rev 5764
Backed out changeset c2a21fe60994
Unfortunately, this breaks backward compatibility.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Dec 2007 19:46:13 +0100] rev 5763
Show number of changesets written to bundle files by default (issue569)
This was only shown with -v before.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Dec 2007 17:45:26 +0100] rev 5762
"C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 30 Dec 2007 17:36:49 +0100] rev 5761
Adjust changed test output after 0145f9afb0e7 (trailing whitespace)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 29 Dec 2007 19:49:48 +0100] rev 5760
Removed tabs and trailing whitespace in python files
Patrick Mezard <pmezard@gmail.com> [Sat, 29 Dec 2007 01:14:45 +0100] rev 5759
util: filter all st_mode with 0777 in checkexec
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Dec 2007 17:10:57 +0100] rev 5758
merge with crew
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Dec 2007 17:10:25 +0100] rev 5757
Clarify some messages during commit:
- use "branch 'foo'" to distinguish from "branch merge".
- commit messags can be empty (to abort commits)
- Added value for editor message: Tell about HG: lines like CVS does.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 28 Dec 2007 16:32:14 +0100] rev 5756
merge with crew
Patrick Mezard <pmezard@gmail.com> [Fri, 28 Dec 2007 16:46:44 +0100] rev 5755
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Fri, 28 Dec 2007 14:51:16 +0100] rev 5754
Prompt for a commit message in editor, improve error message
Patrick Mezard <pmezard@gmail.com> [Thu, 27 Dec 2007 22:40:07 -0600] rev 5753
patchbomb: make --bundle respect --desc
Patrick Mezard <pmezard@gmail.com> [Fri, 28 Dec 2007 16:41:40 +0100] rev 5752
patchbomb: read bundle file in binary mode
Kirill Smelkov <kirr@mns.spb.ru> [Fri, 28 Dec 2007 00:03:55 -0600] rev 5751
prompt: kill matchflags
Python already lets one to embed RE flags directly in a regex, which
is a much nicer way to do things:
(?iLmsux)
(One or more letters from the set "i", "L", "m", "s", "u", "x".)
...
matchflags was introduced in 67afecb8d6cc, and the record extension is the only
user. I've killed matchflag, and adjusted record code appropriately.
Patrick Mezard <pmezard@gmail.com> [Thu, 27 Dec 2007 19:23:22 +0100] rev 5750
test-convert-cvs: force cvs -f options to avoid cvsrc
There are some reference to a CVS_OPTIONS environment variable doing that but
it does not work on my system (cvs 1.11.20, macosx).
Arun Thomas <arun.thomas@gmail.com> [Wed, 19 Dec 2007 11:56:19 -0500] rev 5749
Patchbomb: Prompt password when using SMTP/TLS and no password in .hgrc.
If .hgrc specifies SMTP/TLS and a username without specifying a password,
prompt for a password.
Christian Ebert <blacktrash@gmx.net> [Wed, 19 Dec 2007 10:11:32 +0100] rev 5748
highlight: fix more tracebacks by forcing util._encoding to hgweb.encoding
This is needed in case util._encoding and hgweb.encoding conflict.
Extreme example:
HGENCODING=UTF-8
[web]
encoding = ascii
Note:
display of files whose encoding differs from HGENCODING or hgweb.encoding
behaves not exactly the same way as with highlight turned off as replacement
chars are either converted or replaced.
John Coomes <john.coomes@sun.com> [Tue, 18 Dec 2007 12:45:30 -0800] rev 5747
hg tag: run tag hook just once
Christian Ebert <blacktrash@gmx.net> [Tue, 18 Dec 2007 22:50:27 +0100] rev 5746
patchbomb: break lines > 80 chars (coding style)
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5745
changelog: inline trivial call for extra data unescaping
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5744
changelog: remove extract function
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5743
util: simplify unique
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5742
remove unused util.localsub function
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5741
add debugfsinfo to check fs capabilities
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5740
atomictempfile: avoid chmod weirdness on Linux vfat
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5739
checkexec: fix VFAT tempfile droppings with more modern Linux kernels
More recent Linux kernels don't pretend to allow any bogus chmods on
VFAT.
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5738
bisect: use proper locking when updating bisect.state
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5737
bisect: remove class
- rename core function to _bisect
- rename command function to bisect
- move state management to bisect
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5736
bisect: keep history of all bad revisions
- use a single state dict
- find the minimum bad revision
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5735
bisect: use more standard command syntax and help
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5734
bisect: move reporting out of core bisect function
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:40 -0600] rev 5733
bisect: add skip command
- read/write skip lines in state
- skip candidates in skipnodes
- move bisect begin logic to next
- add skip command
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5732
bisect: simplify state handling and init
- use a single bisect.state file
- unify init and reset (delete the state)
- move write into good/bad
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5731
bisect: remove unused imports
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5730
bisect: rename autobad/good/next
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5729
bisect: slightly improve the help message
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5728
bisect: remove stale test function
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5727
bisect: use array.array rather than lists for ancestor lists
This nearly doubles performance and cuts memory usage in half on large
bisections.
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5726
bisect: switch individual ancestor lists from dict to list
This saves quite a lot of memory and increases performance
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5725
bisect: turn ancestors into an array
This makes things faster and eliminates the separate stop hash
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5724
bisect: greatly simplify the ancestor accumulating loop
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5723
bisect: switch to rev-based calculation
- use revlog.parentrevs in search loops
- calculate stop directly in O(N) without reachable
- move badrev check into candidates
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5722
bisect: fix up node vs rev naming
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5721
bisect: clarify some bisection code
- rename __ancestors... to candidates
- remove head parameter (it's always badrev)
- eliminate comprehensions to shrink parents
- num_ancestors -> n_child name fix
- clarify node selection
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5720
bisect: inline num_children function
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5719
bisect: remove usage of sets
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5718
bisect: remove stop argument to ancestors function
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5717
bisect: use bail_if_changed
- switch to using existing bail_if_changed code
- only abort when we're about to do an update
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5716
cmdutil: make bail_if_changed bail on uncommitted merge
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5715
bisect: remove versionstr
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5714
bisect: simplify lookup
- use repo.lookup directly
- move merge check to check_clean
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5713
bisect: remove redundant clean checks
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5712
bisect: fold in two trivial functions
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:39 -0600] rev 5711
bisect: remove two unused functions
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 23:55:36 -0600] rev 5710
update test-merge-types
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:49:01 -0600] rev 5709
ui: allow default when prompting
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:47:44 -0600] rev 5708
merge: add flag merging intelligence
- properly handle all 27 combinations of flags
- prompt on conflicts
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:47:41 -0600] rev 5707
util: remove set_exec and set_link methods
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:29:21 -0600] rev 5706
patch: use util.set_flags
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:29:17 -0600] rev 5705
convert/svn: use util.set_flags
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:48 -0600] rev 5704
merge: use util.set_flags
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:47 -0600] rev 5703
wwrite: simplify with util.set_flags
- always attempt to delete the file (gets rid of read-only message)
- always write as a normal file
- use set_flags to convert to link or set exec
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:45 -0600] rev 5702
util: add new set_flags method
This is more efficient than calling set_link and set_exec
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:43 -0600] rev 5701
add --debug to test-merge-types
Matt Mackall <mpm@selenic.com> [Thu, 27 Dec 2007 22:27:37 -0600] rev 5700
merge: simplify merge tests, fix exec flag bug
If local changed exec bit and remote changed file contents, exec bit
change would be lost.
Patrick Mezard <pmezard@gmail.com> [Thu, 27 Dec 2007 22:28:41 +0100] rev 5699
hg: fail upon copy/link errors while cloning locally
Maxim Dounin <mdounin@mdounin.ru> [Thu, 27 Dec 2007 03:14:46 +0300] rev 5698
convert: svn-sink: copy and set properties after adding dirs/files
We can't store properties for files we haven't added to repo. Similarly,
we can't copy file to directory we haven't added to svn yet. Remember
needed changes and apply them in putcommit().
Maxim Dounin <mdounin@mdounin.ru> [Thu, 27 Dec 2007 19:59:44 +0300] rev 5697
convert: don't read ~/.cvsrc in test-convert-cvs
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 27 Dec 2007 13:39:59 +0100] rev 5696
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 26 Dec 2007 23:03:32 +0100] rev 5695
merge with crew-stable
Maxim Dounin <mdounin@mdounin.ru> [Tue, 25 Dec 2007 21:14:11 -0800] rev 5694
convert: allow repo root to be matched in filemap
For consistency with "rename subdir ." syntax in filemap, also support
"rename . subdir".
Kirill Smelkov <kirr@mns.spb.ru> [Tue, 25 Dec 2007 18:48:43 +0300] rev 5693
.hgignore += tags & cscope files
Patrick Mezard <pmezard@gmail.com> [Tue, 25 Dec 2007 22:23:58 +0100] rev 5692
Merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 25 Dec 2007 14:30:10 +0100] rev 5691
merge with crew-stable
Mirko Friedenhagen <mirko-lists@friedenhagen.de> [Mon, 24 Dec 2007 17:21:40 +0100] rev 5690
server: append to logfiles
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Dec 2007 12:22:33 +0100] rev 5689
Move diffing missing file test and remove test-notfound
No point to have a test dedicated to this diff behaviour.
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Dec 2007 12:14:43 +0100] rev 5688
commands: add exits(1) if a specified file cannot be added (issue 891)
Patrick Mezard <pmezard@gmail.com> [Mon, 24 Dec 2007 01:50:07 +0100] rev 5687
test-hgweb-commands: replace all "XX years ago" occurences
Lee Cantey <lcantey@gmail.com> [Fri, 21 Dec 2007 14:26:20 -0800] rev 5686
Switch to using cat with EOF doc instead of trying to quote newlines for echo.