Commit Graph

5898 Commits

Author SHA1 Message Date
Patrick Mezard
8c795eef45 Merge with crew-stable 2008-01-21 14:15:38 +01:00
Patrick Mezard
2e6086567e convert: enforce svn_source.getchanges() files unicity 2008-01-21 10:04:35 +01:00
Patrick Mezard
205c9daa57 localrepo: ensure files unicity in commit() (issue 714) 2008-01-21 10:02:32 +01:00
Alexis S. L. Carvalho
d600347898 test-strip-cross: test handling of linkrev crosses in the manifest 2008-01-20 08:12:07 -02:00
Richard Lowe
14130985ea Fix test-strip-cross on Solaris
Solaris /sbin/sh doesn't do brace expansion
2008-01-19 22:16:15 -05:00
Alexis S. L. Carvalho
ba985d288a simplify revlog.strip interface and callers; add docstring
Also, strip files only after the changelog and the manifest.
2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
8b35462ec9 strip: calculate list of extra nodes to save and pass it to changegroupsubset
When we remove revision N from the repository, all revisions >= N are
affected: either it's a descendant from N and will also be removed, or
it's not a descendant of N and will be renumbered.

As a consequence, we have to (at least temporarily) remove all filelog
and manifest revisions that have a linkrev >= N, readding some of them
later.

Unfortunately, it's possible to have a revlog with two revisions
r1 and r2 such that r1 < r2, but linkrev(r1) > linkrev(r2).  If we try
to strip revision linkrev(r1) from the repository, we'll also lose
revision r2 when we truncate this revlog.

We already use changegroupsubset to create a temporary changegroup
containing the revisions that have to be restored, but that function is
unable to detect that we also wanted to save the r2 in the case above.

So we manually calculate these extra nodes and pass it to changegroupsubset.

This should fix issue764.
2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
4460ff7619 changegroupsubset: accept list of per-revlog nodes to include
This will allow strip to include in the temporary changegroup some extra
file/manifest revisions that should be restored after the truncations.

This code doesn't allow specification of changelog nodes since I won't
need that right now, the code wouldn't be tested and it's probably
possible to do something similar enough by using the bases/heads
arguments.
2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
e39125d9f7 addchangegroup: add option to skip check for empty changelog group 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
a0dd47463e allow the creation of bundles with empty changelog/manifest chunks 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
daf9afc324 repair.py: don't use nested functions. 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
9b687a8fde repair.py: use revs in limitheads 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
c9102dbdfb repair.py: add a docstring to bundle; use repo.ui 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
57e493f050 repair.py: split stripall into two functions; clean it up a bit 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
70423bc0ec repair.py: rename chlog to cl 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
7bc2e3bde0 repair.py: nodes are nodes, revs are revs
Use "striprev" instead of just "rev" to make the patch a bit less
confusing.  This is also a bit clearer than just "revnum".
2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
14dec2c24b repair.py: use node.* directly 2008-01-19 18:01:16 -02:00
Alexis S. L. Carvalho
7f21081e68 repair.py: don't import commands.py 2008-01-19 18:01:16 -02:00
Patrick Mezard
fd3c52fd38 test-no-symlinks: fix unbundle output 2008-01-18 23:59:40 +01:00
Patrick Mezard
094675cac4 Merge with crew-stable 2008-01-19 14:48:31 +01:00
Patrick Mezard
33d8300598 convert: fix invalid svn.ra.check_path() call (issue 771)
The svn transport must be reparented to repository root before using
check_path() with full entrypaths.
2008-01-19 14:39:30 +01:00
Patrick Mezard
1fd102a610 Merge with crew-stable 2008-01-19 13:19:27 +01:00
Christian Ebert
3f18608289 keyword: add very simple mq test 2008-01-19 03:06:01 +01:00
Bryan O'Sullivan
3cd6b499f4 Fix typo. 2008-01-18 17:01:28 -08:00
Patrick Mezard
37bb6e0440 util_win32: make os_link more robust (issue 761)
On mapped drives, os_link() manages to create links but nlink() does not report them.
2008-01-18 23:56:51 +01:00
Bryan O'Sullivan
97d2f7c1b5 Fix test output 2008-01-18 13:54:33 -08:00
Bryan O'Sullivan
226aedbbf9 Merge with crew 2008-01-18 13:49:11 -08:00
Dirkjan Ochtman
4de316f884 hgweb: fast path for sending raw files 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
a854166262 hgweb: just return iterables instead of yielding them 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
e43716d86a hgweb: separate out start_response() calling 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
54b4ea87f1 hgweb: return iterable, add deprecation note 2008-01-18 19:53:38 +01:00
Dirkjan Ochtman
0d71615663 hgweb: remove some legacy code 2008-01-18 19:53:38 +01:00
Matt Mackall
63cc8c83c8 transform a bunch of print statements to appropriate ui calls 2008-01-18 10:48:25 -06:00
Matt Mackall
93afbf490d Merge with crew 2008-01-18 10:07:36 -06:00
Matt Mackall
d743a8c08a hooks: fix pre- and post- hooks specified in .hg/hgrc
We were looking up hooks in the wrong ui object. Also, we weren't
handling hooks to commands without a repo.
2008-01-18 09:03:17 -06:00
Nicholas Riley
05afc88692 [PATCH] zsh_completion tag/mq fixes
Been using these for almost a month now without problems, so I figured
some other people might want them.

This allows the zsh completion to work with tags and mq patch names
containing spaces, and adds support for qgoto.
2008-01-18 08:23:29 -06:00
Giorgos Keramidas
b766302801 tests: Use /bin/sh for test-journal-exists, /bin/bash may not be available 2008-01-18 03:06:05 +02:00
Patrick Mezard
f10cd30969 convert: document the subversion conversion model 2008-01-18 00:16:20 +01:00
Patrick Mezard
9dbb96c198 convert: fetch less revisions when looking for a branch parent 2008-01-17 23:46:56 +01:00
Patrick Mezard
bfc0212349 Test subversion branches conversion 2008-01-17 23:46:56 +01:00
Patrick Mezard
0f86329781 convert: make svn revision iterator interruptible 2008-01-17 23:46:56 +01:00
Patrick Mezard
77bf6d76c9 convert: fix cross-branches subversion revisions handling
The "one revision belongs to one branch" assumptions is relaxed. Branch
revisions are parsed down to the first branch copy encountered, older history
is skipped. It means the conversion is still not satisfying when dealing with
branches overwriting themselves. This issue already existed in the previous
version.
2008-01-17 23:46:56 +01:00
Matt Mackall
7a268371b0 patchbomb: prompt only once for SMTP password
- simplify mail._sendmail to be a function rather than a class
- simplify connect to return a function rather than a class
- move exception handling from mail.sendmail to mail.connect
- use a single connection for all messages in patchbomb
2008-01-17 13:51:59 -06:00
Matt Mackall
a68910fcf1 transactions: don't show a backtrace when journal exists
Now we simply print a message on how to recover.
2008-01-16 11:32:25 -06:00
Matt Mackall
df08f67213 Merge with crew 2008-01-16 11:14:51 -06:00
Matt Mackall
11423d02c7 diff: don't show function name by default
We'd mistakenly made the -p option always on, which meant there was no
way to turn it off. It also meant that we were sometimes splitting
multibyte characters in function name, which isn't a good default.
2008-01-16 11:14:24 -06:00
Thomas Arendsen Hein
d494cbe846 merge with main 2008-01-15 23:04:44 +01:00
Matt Mackall
a700f7f56c Merge with crew 2008-01-15 15:49:24 -06:00
Christian Ebert
a07599ee0c keyword: avoid extra diffs when not comparing against working dir
When diffing against specified revisions expanded keywords
only get in the way.

Update test output.
2008-01-15 14:39:53 +01:00
Christian Ebert
e655be0aaf keyword: support mq; handle (q)record more gracefully
mq:
Ensure that expanded keywords do not make it into patches.
- disable expansion when reading filelog
- shrink expanded keywords when reading from working dir (wread)

(q)record:
Avoid additional hunks due to expanded keywords. However this is
still a compromise, as keyword expansions are not updated in
working directory because record should not overwrite files.

Mention above shortcomings and "hg kwexpand" workaround in help
and update test output.

system argument parsing:
Command detection might be slightly more expensive with
dispatch._parse, but we will need this for improving "hg diff"
output.
2008-01-15 13:58:22 +01:00