Mercurial > traipse_dev
comparison upmana/mercurial/subrepo.py @ 121:496dbf12a6cb alpha
Traipse Alpha 'OpenRPG' {091030-00}
Traipse is a distribution of OpenRPG that is designed to be easy to setup and go.
Traipse also makes it easy for developers to work on code without fear of
sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the
code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the
productivity of the user.
Update Summary (Cleaning up for Beta):
Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images!
Changes made to the map for increased portability. SnowDog has changes planned in
Core, though.
Added an initial push to the BCG. Not much to see, just shows off how it is
re-writing Main code.
Fix to remote admin commands
Minor fix to texted based server, works in /System/ folder
Some Core changes to gametree to correctly disply Pretty Print, thanks David!
Fix to Splitter Nodes not being created.
Added images to Plugin Control panel for Autostart feature
Fix to massive amounts of images loading; from Core
fix to gsclient so with_statement imports
Added 'boot' command to remote admin
Prep work in Pass tool for remote admin rankings and different passwords, ei,
Server, Admin, Moderator, etc.
Remote Admin Commands more organized, more prep work.
Added Confirmation window for sent nodes.
Minor changes to allow for portability to an OpenSUSE linux OS (hopefully without
breaking)
{091028}
Made changes to gametree to start working with Element Tree, mostly from Core
Minor changes to Map to start working with Element Tree, from Core
Preliminary changes to map efficiency, from FlexiRPG
Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG
Changes to main.py to start working with Element Tree
{091029}
Changes made to server to start working with Element Tree.
Changes made to Meta Server Lib. Prepping test work for a multi meta network
page.
Minor bug fixed with mini to gametree
Zoom Mouse plugin added.
{091030}
Getting ready for Beta. Server needs debugging so Alpha remains bugged.
Plugin UI code cleaned. Auto start works with a graphic, pop-up asks to enable or
disable plugin.
Update Manager now has a partially working Status Bar. Status Bar captures
terminal text, so Merc out put is visible. Manifest.xml file, will be renamed, is
now much cleaner.
Debug Console has a clear button and a Report Bug button. Prep work for a Term2Win
class in Debug Console.
Known: Current Alpha fails in Windows.
| author | sirebral |
|---|---|
| date | Fri, 30 Oct 2009 22:21:40 -0500 |
| parents | |
| children |
comparison
equal
deleted
inserted
replaced
| 120:d86e762a994f | 121:496dbf12a6cb |
|---|---|
| 1 # subrepo.py - sub-repository handling for Mercurial | |
| 2 # | |
| 3 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | |
| 4 # | |
| 5 # This software may be used and distributed according to the terms of the | |
| 6 # GNU General Public License version 2, incorporated herein by reference. | |
| 7 | |
| 8 import errno, os | |
| 9 from i18n import _ | |
| 10 import config, util, node, error | |
| 11 localrepo = hg = None | |
| 12 | |
| 13 nullstate = ('', '') | |
| 14 | |
| 15 def state(ctx): | |
| 16 p = config.config() | |
| 17 def read(f, sections=None, remap=None): | |
| 18 if f in ctx: | |
| 19 try: | |
| 20 p.parse(f, ctx[f].data(), sections, remap) | |
| 21 except IOError, err: | |
| 22 if err.errno != errno.ENOENT: | |
| 23 raise | |
| 24 read('.hgsub') | |
| 25 | |
| 26 rev = {} | |
| 27 if '.hgsubstate' in ctx: | |
| 28 try: | |
| 29 for l in ctx['.hgsubstate'].data().splitlines(): | |
| 30 revision, path = l.split() | |
| 31 rev[path] = revision | |
| 32 except IOError, err: | |
| 33 if err.errno != errno.ENOENT: | |
| 34 raise | |
| 35 | |
| 36 state = {} | |
| 37 for path, src in p[''].items(): | |
| 38 state[path] = (src, rev.get(path, '')) | |
| 39 | |
| 40 return state | |
| 41 | |
| 42 def writestate(repo, state): | |
| 43 repo.wwrite('.hgsubstate', | |
| 44 ''.join(['%s %s\n' % (state[s][1], s) | |
| 45 for s in sorted(state)]), '') | |
| 46 | |
| 47 def submerge(repo, wctx, mctx, actx): | |
| 48 if mctx == actx: # backwards? | |
| 49 actx = wctx.p1() | |
| 50 s1 = wctx.substate | |
| 51 s2 = mctx.substate | |
| 52 sa = actx.substate | |
| 53 sm = {} | |
| 54 | |
| 55 for s, l in s1.items(): | |
| 56 a = sa.get(s, nullstate) | |
| 57 if s in s2: | |
| 58 r = s2[s] | |
| 59 if l == r or r == a: # no change or local is newer | |
| 60 sm[s] = l | |
| 61 continue | |
| 62 elif l == a: # other side changed | |
| 63 wctx.sub(s).get(r) | |
| 64 sm[s] = r | |
| 65 elif l[0] != r[0]: # sources differ | |
| 66 if repo.ui.prompt( | |
| 67 _(' subrepository sources for %s differ\n' | |
| 68 'use (l)ocal source (%s) or (r)emote source (%s)?') | |
| 69 % (s, l[0], r[0]), | |
| 70 (_('&Local'), _('&Remote')), _('l')) == _('r'): | |
| 71 wctx.sub(s).get(r) | |
| 72 sm[s] = r | |
| 73 elif l[1] == a[1]: # local side is unchanged | |
| 74 wctx.sub(s).get(r) | |
| 75 sm[s] = r | |
| 76 else: | |
| 77 wctx.sub(s).merge(r) | |
| 78 sm[s] = l | |
| 79 elif l == a: # remote removed, local unchanged | |
| 80 wctx.sub(s).remove() | |
| 81 else: | |
| 82 if repo.ui.prompt( | |
| 83 _(' local changed subrepository %s which remote removed\n' | |
| 84 'use (c)hanged version or (d)elete?') % s, | |
| 85 (_('&Changed'), _('&Delete')), _('c')) == _('d'): | |
| 86 wctx.sub(s).remove() | |
| 87 | |
| 88 for s, r in s2.items(): | |
| 89 if s in s1: | |
| 90 continue | |
| 91 elif s not in sa: | |
| 92 wctx.sub(s).get(r) | |
| 93 sm[s] = r | |
| 94 elif r != sa[s]: | |
| 95 if repo.ui.prompt( | |
| 96 _(' remote changed subrepository %s which local removed\n' | |
| 97 'use (c)hanged version or (d)elete?') % s, | |
| 98 (_('&Changed'), _('&Delete')), _('c')) == _('c'): | |
| 99 wctx.sub(s).get(r) | |
| 100 sm[s] = r | |
| 101 | |
| 102 # record merged .hgsubstate | |
| 103 writestate(repo, sm) | |
| 104 | |
| 105 def _abssource(repo, push=False): | |
| 106 if hasattr(repo, '_subparent'): | |
| 107 source = repo._subsource | |
| 108 if source.startswith('/') or '://' in source: | |
| 109 return source | |
| 110 parent = _abssource(repo._subparent) | |
| 111 if '://' in parent: | |
| 112 if parent[-1] == '/': | |
| 113 parent = parent[:-1] | |
| 114 return parent + '/' + source | |
| 115 return os.path.join(parent, repo._subsource) | |
| 116 if push and repo.ui.config('paths', 'default-push'): | |
| 117 return repo.ui.config('paths', 'default-push', repo.root) | |
| 118 return repo.ui.config('paths', 'default', repo.root) | |
| 119 | |
| 120 def subrepo(ctx, path): | |
| 121 # subrepo inherently violates our import layering rules | |
| 122 # because it wants to make repo objects from deep inside the stack | |
| 123 # so we manually delay the circular imports to not break | |
| 124 # scripts that don't use our demand-loading | |
| 125 global localrepo, hg | |
| 126 import localrepo as l, hg as h | |
| 127 localrepo = l | |
| 128 hg = h | |
| 129 | |
| 130 util.path_auditor(ctx._repo.root)(path) | |
| 131 state = ctx.substate.get(path, nullstate) | |
| 132 if state[0].startswith('['): # future expansion | |
| 133 raise error.Abort('unknown subrepo source %s' % state[0]) | |
| 134 return hgsubrepo(ctx, path, state) | |
| 135 | |
| 136 class hgsubrepo(object): | |
| 137 def __init__(self, ctx, path, state): | |
| 138 self._path = path | |
| 139 self._state = state | |
| 140 r = ctx._repo | |
| 141 root = r.wjoin(path) | |
| 142 if os.path.exists(os.path.join(root, '.hg')): | |
| 143 self._repo = localrepo.localrepository(r.ui, root) | |
| 144 else: | |
| 145 util.makedirs(root) | |
| 146 self._repo = localrepo.localrepository(r.ui, root, create=True) | |
| 147 self._repo._subparent = r | |
| 148 self._repo._subsource = state[0] | |
| 149 | |
| 150 def dirty(self): | |
| 151 r = self._state[1] | |
| 152 if r == '': | |
| 153 return True | |
| 154 w = self._repo[None] | |
| 155 if w.p1() != self._repo[r]: # version checked out changed | |
| 156 return True | |
| 157 return w.dirty() # working directory changed | |
| 158 | |
| 159 def commit(self, text, user, date): | |
| 160 n = self._repo.commit(text, user, date) | |
| 161 if not n: | |
| 162 return self._repo['.'].hex() # different version checked out | |
| 163 return node.hex(n) | |
| 164 | |
| 165 def remove(self): | |
| 166 # we can't fully delete the repository as it may contain | |
| 167 # local-only history | |
| 168 self._repo.ui.note(_('removing subrepo %s\n') % self._path) | |
| 169 hg.clean(self._repo, node.nullid, False) | |
| 170 | |
| 171 def get(self, state): | |
| 172 source, revision = state | |
| 173 try: | |
| 174 self._repo.lookup(revision) | |
| 175 except error.RepoError: | |
| 176 self._repo._subsource = source | |
| 177 self._repo.ui.status(_('pulling subrepo %s\n') % self._path) | |
| 178 srcurl = _abssource(self._repo) | |
| 179 other = hg.repository(self._repo.ui, srcurl) | |
| 180 self._repo.pull(other) | |
| 181 | |
| 182 hg.clean(self._repo, revision, False) | |
| 183 | |
| 184 def merge(self, state): | |
| 185 hg.merge(self._repo, state[1], remind=False) | |
| 186 | |
| 187 def push(self, force): | |
| 188 # push subrepos depth-first for coherent ordering | |
| 189 c = self._repo[''] | |
| 190 subs = c.substate # only repos that are committed | |
| 191 for s in sorted(subs): | |
| 192 c.sub(s).push(force) | |
| 193 | |
| 194 self._repo.ui.status(_('pushing subrepo %s\n') % self._path) | |
| 195 dsturl = _abssource(self._repo, True) | |
| 196 other = hg.repository(self._repo.ui, dsturl) | |
| 197 self._repo.push(other, force) | |
| 198 |