Mercurial > hg
comparison mercurial/subrepo.py @ 19637:cc338115d3b2
subrepo: make submerge() return the merged substate
This will be useful when reusing submerge() to improve the handling of subrepos
on mq.
# HG changeset patch
# User Angel Ezquerra <angel.ezquerra@gmail.com>
# Date 1377117244 -7200
# Wed Aug 21 22:34:04 2013 +0200
# Node ID 2defb5453f223c3027eb2f7788fbddd52bbb3352
# Parent a5c90acff5e61aae714ba6c9457d766c54b4f124
subrepo: make submerge() return the merged substate
This will be useful when reusing submerge() to improve the handling of subrepos
on mq.
| author | Angel Ezquerra <angel.ezquerra@gmail.com> |
|---|---|
| date | Wed, 21 Aug 2013 22:34:04 +0200 |
| parents | c58b6ab4c26f |
| children | c26690fe5f08 |
comparison
equal
deleted
inserted
replaced
| 19636:6bbce5efc67b | 19637:cc338115d3b2 |
|---|---|
| 235 wctx.sub(s).get(r) | 235 wctx.sub(s).get(r) |
| 236 sm[s] = r | 236 sm[s] = r |
| 237 | 237 |
| 238 # record merged .hgsubstate | 238 # record merged .hgsubstate |
| 239 writestate(repo, sm) | 239 writestate(repo, sm) |
| 240 return sm | |
| 240 | 241 |
| 241 def _updateprompt(ui, sub, dirty, local, remote): | 242 def _updateprompt(ui, sub, dirty, local, remote): |
| 242 if dirty: | 243 if dirty: |
| 243 msg = (_(' subrepository sources for %s differ\n' | 244 msg = (_(' subrepository sources for %s differ\n' |
| 244 'use (l)ocal source (%s) or (r)emote source (%s)?\n' | 245 'use (l)ocal source (%s) or (r)emote source (%s)?\n' |