Commit Graph

46 Commits

Author SHA1 Message Date
Brett Cannon
8e100766b6 subrepo: fix repo root path handling in svn subrepo 2010-04-18 14:20:08 -07:00
Edouard Gomez
8969d04970 subrepo: fix hgrc paths section during subrepo pulling
There are two bugs in current subrepo ctor:
 - hgrc paths were using parent repo (ctx._repo) instead of self._repo
 - it was joined with local extract path, not its source repo path

Fixed both bugs using _abssource on self once it is fully initialized.
It gets the job done perfectly for pull and push urls.
2010-03-14 00:28:10 +01:00
Benoit Boissinot
9803653bf1 subrepo: keep ui and hgrc in sync when creating new repo 2010-03-12 01:23:35 +01:00
Edouard Gomez
ec1cf25023 subrepo: forward the push to argument into _abssource 2010-03-12 01:23:35 +01:00
Benoit Boissinot
7dae5be27b i18n: mark more strings for translation 2010-02-19 02:23:38 +01:00
David Soria Parra
11f271739c subrepo: make sure that the source path is stripped
Test by Patrick Mézard <pmezard@gmail.com>
2010-02-09 18:32:57 +01:00
Saint Germain
ca80dfaea9 subrepo: change default path in hgrc of subrepo after cloning
Previous behavior was to put in the cloned subrepos the path found in the original main repo.
However it isn't valid for relative path and it seems more logical to reference instead the subrepos
working copy path of the original main repo.
2010-02-06 19:14:37 +01:00
David Soria Parra
6dcc1537f6 subrepo: correct copyright 2010-02-06 10:23:18 +01:00
Benoit Boissinot
5fd3bf33e2 subrepo: fix errors reported by pylint 2010-01-31 18:02:16 +01:00
Patrick Mezard
b3819101ba subrepo: handle svn externals and meta changes (issue1982)
- Detect changes to meta on regular and external entries
- Do not try to commit external entries
2010-01-21 13:26:26 +01:00
Patrick Mezard
8cc6cf7f71 subrepo: svn xml output is much easier to parse
That's especially true with status flags: there are different fields and values
for regular changes, meta changes, externals changes and externals meta
changes.
2010-01-21 15:13:40 +01:00
Patrick Mezard
d8a25e7f28 subrepo: make svn use C locale for portability
My reasons to do 877151efa5f3 were wrong. We want to have non-localized svn
output while preserving current locale for input arguments and svn internals.
This is achieved by setting LC_MESSAGE=C.
2010-01-21 15:13:03 +01:00
Matt Mackall
cd3ef170f7 Merge with stable 2010-01-19 22:45:09 -06:00
Matt Mackall
595d66f424 Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
Benoit Boissinot
ef2921d9e6 merge with stable 2010-01-15 21:32:53 +01:00
Benoit Boissinot
8fa7d00586 subrepo: fix merging of already merged subrepos (issue1986)
This fixes a bug seen when merging a main repo which contains a subrepo when
both repos have been merged before. Each repo (main and sub) has two
branches, both of which have been merged before.

In a subrepo, if the revision to merge to is an ancestor of the current rev,
then the merge should be a noop.

Test provided by Steve Losh.
2010-01-15 21:08:04 +01:00
Matt Mackall
4387f67807 subrepo: add default path to new clones 2009-12-14 15:01:13 -06:00
Matt Mackall
238098252f submerge: properly deal with overwrites
also pull .hgsubstate check out of inner loop
2009-11-08 10:29:52 -06:00
Matt Mackall
297f3b873b subrepo: add more debugging output, lose _ markers 2009-11-08 10:24:18 -06:00
Matt Mackall
ca298b21c0 subrepo: do a linear update when appropriate 2009-11-07 16:31:43 -06:00
Matt Mackall
34dc7c3fa5 subrepo: notice dirty subrepo states when merging 2009-11-07 16:30:42 -06:00
Matt Mackall
7900d62499 subrepo: add some debug output to submerge 2009-11-07 16:29:49 -06:00
Matt Mackall
03aa7b74f1 subrepo: more robust split for .hgsubstate parsing 2009-11-07 14:09:16 -06:00
Matt Mackall
3e6199cea0 Merge with -stable 2009-09-30 21:42:51 -05:00
Matt Mackall
76ac5743c5 subrepo: add auto-pull for merge 2009-09-30 18:47:33 -05:00
Matt Mackall
60ca8ea58d subrepo: use '/' for joining non-local paths 2009-07-22 17:53:23 -05:00
Matt Mackall
aa26914af7 subrepo: audit subrepo paths 2009-07-01 13:55:24 -05:00
Dirkjan Ochtman
da9d2d8f2b merge with crew-stable 2009-07-23 20:44:26 +02:00
Abderrahim Kitouni
45a072d541 subrepo: use hg.repository instead of creating localrepo directly
this way, extensions' reposetup will be called, which allows for git
subrepos to be handled by hg-git (and I believe the same goes for
svn and hgsubversion)
2009-07-04 14:18:15 +01:00
Martin Geisler
ecfc8a98d6 filemerge, subrepo: correct indention 2009-07-07 17:26:20 +02:00
Simon Heimberg
e0e4fc74e3 ui: extract choice from prompt
avoid translating single characters (as l for _local or sym_link)
2009-06-21 01:13:19 +02:00
Dongsheng Song
4e62c61983 Fix warning: Seen unexpected token "%" 2009-06-19 14:28:29 +08:00
Matt Mackall
459bbfbb56 subrepo: basic push support 2009-06-15 02:46:20 -05:00
Matt Mackall
430046de97 subrepo: add update/merge logic 2009-06-15 02:45:38 -05:00
Matt Mackall
fd08adf4d6 commit: recurse into subrepositories 2009-06-15 02:45:38 -05:00
Matt Mackall
ce2e49a0da subrepo: introduce basic state parsing 2009-06-15 02:45:38 -05:00
Jens Bäckman
5c0be1ee6f subrepo: fix typo in help text 2010-01-09 23:12:21 +01:00
Patrick Mezard
324692dc75 subrepo: force en_US.UTF-8 locale when calling svn
Parser only knows about en_US output. Forcing the encoding to UTF-8 might not
be the best thing to do since the caller may receive some of the subversion
output, but at least it should prevent conversion errors from svn client.
2010-01-02 16:42:00 +01:00
Patrick Mezard
a0b47f1b48 subrepo: normalize svn output line-endings 2010-01-02 16:03:25 +01:00
Martin Geisler
4a972a4431 subrepo: mark string for translation and fix case 2010-01-01 18:46:24 +01:00
Augie Fackler
3851c9d2b8 subrepo: Subversion support 2009-12-31 13:16:03 -06:00
Augie Fackler
83a898418b subrepo: add table-based dispatch for subrepo types 2009-12-31 17:10:03 -06:00
Augie Fackler
ed975d02f0 subrepo: load from a context where the subrepo exists 2009-12-31 16:30:34 -06:00
Matt Mackall
3a5a0bbe7e subrepo: fix includes support in .hgsub 2009-12-31 17:25:46 -06:00
Matt Mackall
3365ccd07f Merge with -stable 2009-12-14 15:02:02 -06:00
Augie Fackler
3f9bd57c62 subrepo: document necessary methods for a subrepo class 2009-12-09 14:33:22 -06:00