Commit Graph

5775 Commits

Author SHA1 Message Date
Shun-ichi GOTO
41dab6891f 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.
2008-01-03 06:25:30 +09:00
Shun-ichi GOTO
85f8bf0d61 convert: svn_sink: specify encoding of message file explicitly on commit. 2008-01-03 06:25:30 +09:00
Peter Arrenbrecht
30621bccda 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.)
2008-01-02 16:24:13 +01:00
Kevin Christen
b4e5110cee Add colored output to status and qseries commands 2007-12-31 09:15:39 -06:00
Christian Ebert
25f9c1f1c6 patchbomb: simplify some line continuations 2007-12-30 14:43:03 +01:00
Christian Ebert
bce3304993 patchbomb: add linebreaks after colons (coding style) 2007-12-30 14:24:03 +01:00
Kevin Christen
1b023c6158 Fixed XHTML validation errors 2008-01-03 13:39:26 -06:00
Thomas Arendsen Hein
35cbed7baa Move aliases section in help below synopsis (issue362)
This should avoid confusion why e.g. "hg help co" shows help
for "hg update" instead.
2008-01-02 20:22:10 +01:00
Patrick Mezard
2c5d3eddb4 test-convert-svn-source: test stop revision 2008-01-01 23:12:48 +01:00
Thomas Arendsen Hein
ba430fb598 Sort commands table again and add some missing 'hg' in synopsises. 2008-01-01 19:20:03 +01:00
Thomas Arendsen Hein
fdf4576462 Obfuscate (instead of just escape) contact/owner in gitweb summary.
This could contain an email address.
2008-01-01 17:12:37 +01:00
Thomas Arendsen Hein
1566cda979 Don't let ui.username override web.contact (issue900)
63beab327d26 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.
2008-01-01 17:07:15 +01:00
Thomas Arendsen Hein
70877e1ad5 realign commands table 2008-01-01 11:19:15 +01:00
Matt Mackall
6b6b2e0e73 bisect: improve tests
- test skipping
- test noupdate
- test bad->good search
- test inconsistent state
2007-12-31 18:20:34 -06:00
Matt Mackall
917f5ce70a 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.
2007-12-31 18:20:34 -06:00
Matt Mackall
bee8b54b36 bisect: make bisect a built-in command 2007-12-31 18:20:34 -06:00
Matt Mackall
bf7c69c4dd bisect: faster merging 2007-12-31 18:20:34 -06:00
Matt Mackall
0976a2712a bisect: merge ancestor lists when pushing to children
- eliminate some redundant tests and assignments
- move ancestor list merging to child update
2007-12-31 18:20:34 -06:00
Matt Mackall
604ac21000 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.
2007-12-31 18:20:34 -06:00
Matt Mackall
f92274b692 bisect: stop early if we find a perfect candidate 2007-12-31 18:20:34 -06:00
Matt Mackall
21049dc5ca bisect: find best node in ancestor collection pass 2007-12-31 18:20:34 -06:00
Matt Mackall
6cf2de2e05 bisect: calculate candidate set while finding children 2007-12-31 18:20:33 -06:00
Matt Mackall
5466598049 bisect: use a dict for children
We fill in the children only for ancestors of badrev
2007-12-31 18:20:33 -06:00
Matt Mackall
42a77e79cd 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.
2007-12-31 18:20:33 -06:00
Matt Mackall
354a88216b bisect: add noupdate option 2007-12-31 18:20:33 -06:00
Matt Mackall
ecc644d5d1 Merge backout 2007-12-31 18:20:25 -06:00
Matt Mackall
62cb860a38 Backed out changeset f019d9201ff4
Unfortunately, this breaks backward compatibility.
2007-12-31 17:47:02 -06:00
Thomas Arendsen Hein
fd0ebb6a0c Show number of changesets written to bundle files by default (issue569)
This was only shown with -v before.
2007-12-30 19:46:13 +01:00
Thomas Arendsen Hein
2be743c9ed "C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
2007-12-30 17:45:26 +01:00
Thomas Arendsen Hein
087cac8a21 Adjust changed test output after 24f7cb0e6b71 (trailing whitespace) 2007-12-30 17:36:49 +01:00
Thomas Arendsen Hein
347da85c36 Removed tabs and trailing whitespace in python files 2007-12-29 19:49:48 +01:00
Patrick Mezard
db911b9d0f util: filter all st_mode with 0777 in checkexec 2007-12-29 01:14:45 +01:00
Thomas Arendsen Hein
d63fbb0105 merge with crew 2007-12-28 17:10:57 +01:00
Thomas Arendsen Hein
8dbd54d63d 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.
2007-12-28 17:10:25 +01:00
Patrick Mezard
f7a359686e Merge with crew-stable 2007-12-28 16:46:44 +01:00
Thomas Arendsen Hein
f1499b31ef merge with crew 2007-12-28 16:32:14 +01:00
Patrick Mezard
d9be0f3383 Prompt for a commit message in editor, improve error message 2007-12-28 14:51:16 +01:00
Kirill Smelkov
cbdc1f53db 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 14a7e862c60f, and the record extension is the only
user. I've killed matchflag, and adjusted record code appropriately.
2007-12-28 00:03:55 -06:00
Patrick Mezard
0f68a55738 patchbomb: make --bundle respect --desc 2007-12-27 22:40:07 -06:00
Patrick Mezard
219b578ed9 patchbomb: read bundle file in binary mode 2007-12-28 16:41:40 +01:00
Patrick Mezard
3cc8f21213 hg: fail upon copy/link errors while cloning locally 2007-12-27 22:28:41 +01:00
Patrick Mezard
d404bfca4f 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).
2007-12-27 19:23:22 +01:00
Thomas Arendsen Hein
e6f1571179 Tests for 2d14cb7e2a9e and a60a6bd11ed6 (interactive prompts during merge) 2007-12-27 13:39:03 +01:00
Thomas Arendsen Hein
0a782ae200 Make ui.prompt repeat on "unrecognized response" again (issue897)
(this was accidentally changed in 18945c2eb022)
2007-12-27 10:32:33 +01:00
Maxim Dounin
54de122616 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().
2007-12-27 03:14:46 +03:00
Maxim Dounin
a8a4715876 convert: don't read ~/.cvsrc in test-convert-cvs 2007-12-27 19:59:44 +03:00
Thomas Arendsen Hein
d02cbcaa88 merge with crew-stable 2007-12-27 13:39:59 +01:00
Thomas Arendsen Hein
3cd6fe199f merge with crew-stable 2007-12-26 23:03:32 +01:00
Thomas Arendsen Hein
94bdbd585c Fix misleading error and prompts during update/merge (issue556) 2007-12-26 22:47:16 +01:00
Maxim Dounin
bd23432b17 convert: allow repo root to be matched in filemap
For consistency with "rename subdir ." syntax in filemap, also support
"rename . subdir".
2007-12-25 21:14:11 -08:00