Commit Graph

15958 Commits

Author SHA1 Message Date
Patrick Mezard
1c2259b5d7 convert/bzr: test tags conversion 2012-02-02 10:15:13 +01:00
Patrick Mezard
c32808c5a9 convert/bzr: handle empty bzr repositories (issue3233) 2012-02-02 10:15:13 +01:00
Patrick Mezard
f7231f2104 convert/bzr: convert all branches (issue3229) (BC)
Instead of opening the target bzr checkout as a single branch, we try to open
it as a repository. This has the following effects:
- All branches are now converted
- bzr branch names are preserved. Previously, the selected branch was always
  converted as 'default'. Branches without a name or 'trunk' are mapped to
  'default branch.
- Lightweight checkouts are no longer supported. Maybe they can be, I did not
  try to fix that at all.

Implementation notes:
- This was a quick fix, I have no knowledge of bzr API besides browsing 2.0.3
  sources.
- The fix was only tested on OSX against bzr 2.4.2.
- Tags discovery does not handle collisions. I have no idea how tags work in
  bzr so maybe such collisions are not possible.
2012-02-02 10:15:12 +01:00
Patrick Mezard
ad5523f701 convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Before this patch, metadata and file names were interpreted like:
- unicode objects were converted to UTF-8
- non unicode objects were left unchanged

Looking at the code and bzr being known for transcoding filenames, we expect
everything to be returned as unicode objects, and we want to encode them in
UTF-8, like the subversion source does. To do that, we just remove the custom
implementation of .recode().
2012-02-02 10:15:04 +01:00
Pierre-Yves David
2e7e0826c5 mq: rename secretcommit to newcommit
This function create secret changeset only when mq.secret is true
2012-01-30 00:05:28 +01:00
Matt Mackall
305a9d65ae merge with stable 2012-02-01 16:28:35 -06:00
Matt Mackall
47fb79d1bd Added signature for changeset 14de698f878d 2012-02-01 14:23:58 -06:00
Matt Mackall
826c35e4f4 phases: don't complain if cset is already public on pushkey (issue3230) 2012-02-01 14:17:26 -06:00
Wagner Bruna
61a6945469 i18n-pt_BR: synchronized with 505fdd35ed94 2012-02-01 17:59:51 -02:00
Matt Mackall
7845d09600 merge with i18n 2012-02-01 13:50:45 -06:00
Pierre-Yves David
55aec6a384 mq: prevent rewriting operation on public changeset
The following operation are denied if the mq changeset is public

* qrefresh
* qpop
* qfold

note: qimport was already denied.
2012-02-01 12:20:10 +01:00
Matt Mackall
cde4dd99cb qpush: avoid trying to manage existing history (issue2218) 2012-01-31 23:13:04 -06:00
Matt Mackall
ad7d6a7360 bundlerepo: try to find containing repo on creation (issue1812) 2012-01-31 17:25:37 -06:00
Wagner Bruna
1129971a76 i18n-pt_BR: miscellaneous spelling and wording fixes 2012-01-31 18:11:08 -02:00
FUJIWARA Katsunori
e056fa2400 i18n-ja: synchronized with d023d0a4f91c 2012-01-31 19:44:09 +09:00
Alexander Sauta
5dde37b920 i18n-ru: synchronized with 89445483fcd2; public phase name changed 2012-01-31 12:30:54 +04:00
Matt Mackall
7b0e33b7e2 phases: add resync example to help topic 2012-01-30 16:37:15 -06:00
Wagner Bruna
2675d94631 i18n-pt_BR: synchronized with 89445483fcd2 2012-01-30 20:17:59 -02:00
Matt Mackall
94245d0910 mq: fix secret description in help 2012-01-30 16:04:14 -06:00
Matt Mackall
902bee47a8 pull: return 1 when no changes found (BC)
Currently we have the following return codes if nothing is found:

                commit   incoming    outgoing      pull     push
intended           1        1           1            1       1
documented         1        1           1            0       1
actual             1        1           1            0       1

This makes pull agree with the rest of the table and makes it easy to
detect "nothing was pulled" in scripts.
2012-01-30 16:01:54 -06:00
Matt Mackall
1c8e8627b0 push: don't treat bookmark as a found change
Treating bookmarks as a found change results in confusing
documentation or output and is less useful for scripting.
2012-01-30 15:56:35 -06:00
Matt Mackall
41ed50006e glossary: add phase terms 2012-01-30 14:44:01 -06:00
Matt Mackall
840a51ffab merge with i18n 2012-01-30 14:14:18 -06:00
Pierre-Yves David
ad2799644a phases: allow phase name in phases.new-commit settings
Before this commit only phase index where accepted
2012-01-30 17:46:15 +01:00
Jens Bäckman
91264f0e38 i18n-sv: snchronized with 9d8bf728dbfc 2012-01-30 16:28:27 +01:00
Pierre-Yves David
13fe947391 qfinish: do not set secret changeset to draft if mq.secret=false
If mq.secret=false, mq should not touch phase
2012-01-30 15:17:08 +01:00
Pierre-Yves David
24ebf577e2 mq: take mq.secret configuration into account when picking the default phase 2012-01-30 17:39:05 +01:00
Pierre-Yves David
7728bdc44c qimport: when mq.secret=True set qimported revision as secret 2012-01-30 17:37:45 +01:00
Pierre-Yves David
d05f57b256 qrefresh: keep changeset phase during refresh 2012-01-30 17:36:30 +01:00
Pierre-Yves David
06ca6deaf4 phases: write default phase data as soon as possible.
Marks phase data as dirty when computing default phase. Actual writing is done
when the lock is released. So, read only operation don't write phase data
because they don't lock the repo.
2012-01-30 17:33:09 +01:00
Pierre-Yves David
605e1c8bba phase: accept old style revision specification 2012-01-30 18:06:57 +01:00
Matt Mackall
2157179ce3 push: return 1 if no changes found (issue3228)
Currently we have the following return codes if nothing is found:

                commit   incoming    outgoing      pull     push
intended           1        1           1            1       1
documented         1        1           1            0       1
actual             1        1           1            0       0

This fixes the lower-right entry.
2012-01-30 11:32:09 -06:00
Matt Mackall
79aca17050 push: more precise failure check on subrepo push
This will let us distinguish between nothing to push and push failed
2012-01-30 11:26:20 -06:00
Matt Mackall
8c3fad2adc push: return 0 when updating bookmarks 2012-01-30 11:23:17 -06:00
Matt Mackall
bf7a89f81c push: fix coding errors in unused branch
This branch will get re-enabled in a subsequent fix
2012-01-30 11:15:34 -06:00
Alexander Sauta
fd1b9dc01f i18n-ru: phases help translated 2012-01-30 13:04:13 +04:00
Alexander Sauta
fb6525a673 i18n-ru: minor corrections on unclear strings 2012-01-30 11:52:38 +04:00
Matt Mackall
b7fe2d0ec5 bookmarks: move current bookmark on update -u and bare pull -u (issue3222)
Currently, this won't update when a #branch spec is in the URL
2012-01-29 14:07:45 -06:00
Andrei Polushin
17c68b67c6 i18n-ru: synchronized with 8147593fb88a 2012-01-30 02:48:03 +07:00
Matt Mackall
684f6eea71 phases: fix verify with secret csets
Verify uses repo.cancopy() to detect whether a repo is a plain old
local repo, so it was giving a confusing error message when secret
changesets were present.
2012-01-29 13:36:10 -06:00
Andrei Polushin
fa39f052c9 i18n-ru: verifying uncertain translations. 2012-01-30 02:07:04 +07:00
Matt Mackall
f549014354 mq: add secret setting 2012-01-29 12:59:21 -06:00
Matt Mackall
27321db359 merge with i18n 2012-01-29 12:59:11 -06:00
Wagner Bruna
9ce1290495 i18n-pt_BR: synchronized with 4206d1b224b3 2012-01-28 09:05:08 -02:00
Matt Mackall
875e0dda31 help: add examples to phases topic 2012-01-27 18:43:41 -06:00
Kevin Bullock
d1f8c5d7da update: note updated bookmark
This brings update in line with pull: we notify the user when an action
indirectly updates a bookmark.
2012-01-27 13:12:56 -06:00
Augie Fackler
4a3654d428 resolve: mention merge-tools topic in help 2012-01-27 14:19:32 -06:00
FUJIWARA Katsunori
96875b39e1 revset: add tests for 'remote()' predicate 2012-01-27 22:29:58 +09:00
FUJIWARA Katsunori
8e9263abed revset: fix documentation for 'remote()' predicate
current documentation for 'remote()' predicate is wrong about
specification of parameters.

there are 3 patterns:

  # of
  param:  id:              remote:
  - 0     current branch   "defult" remote
  - 1     specified        "defult" remote
  - 2     specified        specified
2012-01-27 22:29:58 +09:00
FUJIWARA Katsunori
fa22f7f531 revset: fix 'remote()' failure when remote repo has more revs than local
current 'remote()' implementation uses 'r' variable, even if it is not
initialized when 'if n in repo' is not true.

this causes unexpected exception.
2012-01-27 22:29:58 +09:00