Commit Graph

5929 Commits

Author SHA1 Message Date
Christian Ebert
5e101da3a2 keyword: improve use of dicts
- actually use iteritems() when we iter over items of a dictionary
- store commit hooks in dictionary
  (safe, as hook.hook() sorts before execution)
2008-01-22 13:12:43 +01:00
Christian Ebert
7779e712ef keyword: no expansion on qfold (bugfix) 2008-01-23 10:39:19 +01:00
Bryan O'Sullivan
a9cf7ce6a3 Merge with crew 2008-01-25 15:56:22 -08:00
Thomas Arendsen Hein
3648abc9d4 glog shows at most one file: correct synopsis 2008-01-26 00:14:20 +01:00
Thomas Arendsen Hein
950cdcafb9 Update usage message in test-glog.out
AKA: Remind Thomas to run tests even after trivial changes.
2008-01-25 21:09:14 +01:00
Thomas Arendsen Hein
b7250f2196 Add back elipsis to [OPTION] that was stolen by 35300d41c884 2008-01-25 20:17:48 +01:00
Steve Borho
d28f833304 graphlog: add test for filelog graph 2008-01-25 10:35:04 -06:00
Steve Borho
a089948585 graphlog: add filelog revision grapher
Graph a filelog's DAG, e.g.:  hg glog mercurial/util.py
2008-01-25 10:28:21 -06:00
Thomas Arendsen Hein
4ae55d1279 Test case for hg import --no-commit 2008-01-25 16:18:49 +01:00
Joel Rosdahl
119bfb41b7 Add --no-commit option to import command 2008-01-25 13:48:35 +01:00
Kirill Smelkov
f2664bfd13 qrecord: add tests 2008-01-23 21:49:44 +03:00
Kirill Smelkov
38c0bf7540 qrecord: record complements commit, so qrecord should complement qnew
Also there is an idea flying around to create something that will complement
qrefresh:

- maybe 'qammend'? or
- 'qrefresh --interactive'?

If we settle on '--interactive', then it would be conveniet to add this flag to
'commit' and 'qnew' as well.
2008-01-23 21:49:39 +03:00
Thomas Arendsen Hein
6092c25c73 Remove unneeded "import os.path" 2008-01-23 17:16:33 +01:00
Dirkjan Ochtman
4ea6b6bcae send conservatively capitalized HTTP headers 2008-01-23 14:28:25 +01:00
Ali Gholami Rudi
bdaf736fbc demandimport: handling new relative imports
Mercurial does not work on python2.6 because __import__ takes an
additional argument called level.  This patch merely calls the
built-in __import__ when level is passed.
2008-01-16 19:14:54 +03:30
Dirkjan Ochtman
702f1f50b2 hgweb: move HTTP content types out of header templates
This removes the ability for templates to add custom HTTP headers, which can
easily be re-added if someone needs it. Thanks to asak for repeatedly reviewing
this patch and helping to iron out the quirks.
2008-01-22 10:45:55 +01:00
Dirkjan Ochtman
a51e4d434d hgweb: revert to showing file instead of offering for download 2008-01-22 10:45:52 +01:00
Dirkjan Ochtman
54cd7309f5 hgweb: be sure to send a valid content-type for raw files 2008-01-22 12:31:55 +01:00
Dirkjan Ochtman
83100b06d2 hgweb: use ErrorResponse instead of custom response 2008-01-22 09:28:51 +01:00
Dirkjan Ochtman
cef255cf2f better error reporting for hg serve errors in tests 2008-01-22 09:11:11 +01:00
Dirkjan Ochtman
f4b035d012 hgweb: fix a stupid KeyError introduced in 109699000009
Thanks to Christian Ebert for finding this. Also added a test to prevent this
from happening again.
2008-01-22 09:11:08 +01:00
Dirkjan Ochtman
0b45850058 hgweb: cleanup buglet introduced in 7ec4fd3d8731 2008-01-22 09:11:06 +01:00
Thomas Arendsen Hein
ddce807d45 merge with crew-stable 2008-01-22 00:55:01 +01:00
Thomas Arendsen Hein
76157ccf47 CVS convert: Find correct parent for new branch (issue704)
Previously the parent was determined by the last changeset where the branched
file was changed even if the branch is based on an earlier revision.
Fix written by mpm.
2008-01-22 00:16:50 +01:00
Thomas Arendsen Hein
01046fa09f Test for converting a CVS branch 2008-01-22 00:08:43 +01:00
Patrick Mezard
494df8c5f5 convert: mercurial sink must be local 2008-01-21 22:24:28 +01:00
Thomas Arendsen Hein
133747d109 Fix double import of 're'. 2008-01-21 22:00:44 +01:00
Thomas Arendsen Hein
64125b8004 convert: Do not abort with TypeError if svn commit message is None (issue934) 2008-01-21 21:44:16 +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
Christian Ebert
5c18a69d2e Prefer i in d over d.has_key(i) 2008-01-20 14:39:25 +01:00
Alexis S. L. Carvalho
4f4e7fdb65 fix test-strip-cross on solaris
Apparently "ENVVAR=value command" doesn't work when command is a shell
function.

Reported by Richard Lowe.
2008-01-21 13:37:27 -02:00
Patrick Mezard
8c795eef45 Merge with crew-stable 2008-01-21 14:15:38 +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