Commit Graph

272 Commits

Author SHA1 Message Date
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