Commit Graph

1425 Commits

Author SHA1 Message Date
Michele Cella
76206039da tests for hg serve prefix option 2008-01-22 23:06:37 +01:00
Jesse Glick
dc05781c40 Provide better context for custom Python encode/decode filters.
While some can function with just some text and an optional command name,
others may want a repository object, a ui object, and a file path.
Use the enhanced information to good effect in win32text.dumbdecode's warning.
2007-12-21 23:21:17 -05:00
Patrick Mezard
79c0636ca8 Merge with crew-stable 2008-01-26 20:04:31 +01:00
Patrick Mezard
fd2ee26173 convert: hg.clonebranches must pull missing parents (issue941) 2008-01-26 19:55:04 +01:00
Patrick Mezard
517ab12c84 convert: prevent svn branches to leave the root module tree 2008-01-26 14:45:04 +01:00
Patrick Mezard
440a00cc2c convert: fix svn_source.latest() 2008-01-26 14:45:04 +01:00
Patrick Mezard
8eb60ebaa2 convert: display source revision id with --verbose 2008-01-26 14:45:04 +01:00
Jesse Glick
b6fdc96f71 Permitting the import command to accept a --user option.
The prose section of the help text for the command already said that -u and -m
are accepted, but -u was not listed in the table of options, and did not work.
Useful when accepting patches from other people made by hg diff rather than hg
export. For completeness, also accepting -d DATE.
[CHANGES: rebased against 2f0da487820f, --no-commit option.]
2008-01-25 19:49:15 -05:00
Bryan O'Sullivan
7f94d92bf3 Merge with crew 2008-01-25 16:24:00 -08:00
Bryan O'Sullivan
af713110c4 Simplify test-paths 2008-01-25 16:18:00 -08:00
Thomas Arendsen Hein
10700bb24c merge with crew 2008-01-26 01:06:31 +01:00
Jesse Glick
e01183da16 Permit glob patterns to use nested curly braces. 2008-01-25 15:54:25 -05: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
Steve Borho
d28f833304 graphlog: add test for filelog graph 2008-01-25 10:35:04 -06:00
Thomas Arendsen Hein
4ae55d1279 Test case for hg import --no-commit 2008-01-25 16:18:49 +01:00
Kirill Smelkov
f2664bfd13 qrecord: add tests 2008-01-23 21:49:44 +03:00
Dirkjan Ochtman
4ea6b6bcae send conservatively capitalized HTTP headers 2008-01-23 14:28:25 +01:00
Bryan O'Sullivan
a9cf7ce6a3 Merge with crew 2008-01-25 15:56:22 -08: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
2e6086567e convert: enforce svn_source.getchanges() files unicity 2008-01-21 10:04:35 +01:00
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
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
Thomas Arendsen Hein
ddce807d45 merge with crew-stable 2008-01-22 00:55:01 +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
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
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
Christian Ebert
3f18608289 keyword: add very simple mq test 2008-01-19 03:06:01 +01:00
Bryan O'Sullivan
97d2f7c1b5 Fix test output 2008-01-18 13:54:33 -08: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
Matt Mackall
93afbf490d Merge with crew 2008-01-18 10:07:36 -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
bfc0212349 Test subversion branches conversion 2008-01-17 23:46:56 +01: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
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
Giorgos Keramidas
ce5f6f93a6 Display debugstate dates as '%Y-%m-%d %H:%M:%S' 2008-01-11 23:30:56 +02:00
Matt Mackall
262c766059 merge: add a bit more sanity to divergent copy checks 2008-01-14 16:28:32 -06:00
Christian Ebert
3cecc890c2 keyword: test that expansion is done filewise
Checks issue fixed in e56f3648b9a0.
2008-01-11 23:36:56 +01:00
Thomas Arendsen Hein
3b2b9afe52 Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.
2008-01-14 09:00:23 +01:00
Jesse Glick
b63e70848a Ensure that absolutized paths from hgrc do not contain ../ segments. 2008-01-08 22:40:51 -05:00
Edouard Gomez
a51d1ef742 convert: separate trunk detection from branch layout detection
In some subversion repositories, trunk is present but no branches
are used. The current code is assuming that both trunk and branches
must exist before adding trunk's head to the heads list.

It's just better to separate the branch layout stuff from the trunk one.
2008-01-05 01:51:21 +01:00