Mercurial > hgsubversion
comparison hgsubversion/svncommands.py @ 1265:4744b7bfa476
layouts: change constructor to take a meta object
This change is another step forward to centralize subversion configuration
options and help refactor.
I couldn't find an easier way to split up this change since there are many
interdependent function calls. There is no functionality change in this patch,
only renaming ui -> meta.
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Mon, 24 Mar 2014 11:20:49 -0500 |
| parents | 199933008ab5 |
| children | 5ee3e5030a35 |
comparison
equal
deleted
inserted
replaced
| 1264:eded1e736a7e | 1265:4744b7bfa476 |
|---|---|
| 187 assert revpath.startswith(subdir), ('That does not look like the ' | 187 assert revpath.startswith(subdir), ('That does not look like the ' |
| 188 'right location in the repo.') | 188 'right location in the repo.') |
| 189 | 189 |
| 190 if layout is None: | 190 if layout is None: |
| 191 layout = layouts.detect.layout_from_commit(subdir, revpath, | 191 layout = layouts.detect.layout_from_commit(subdir, revpath, |
| 192 ctx.branch(), ui) | 192 ctx.branch(), meta) |
| 193 existing_layout = layouts.detect.layout_from_file(meta.metapath) | 193 existing_layout = layouts.detect.layout_from_file(meta) |
| 194 if layout != existing_layout: | 194 if layout != existing_layout: |
| 195 util.dump(layout, meta.layout_file) | 195 util.dump(layout, meta.layout_file) |
| 196 layoutobj = layouts.layout_from_name(layout, ui) | 196 layoutobj = layouts.layout_from_name(layout, meta) |
| 197 elif layout == 'single': | 197 elif layout == 'single': |
| 198 assert (subdir or '/') == revpath, ('Possible layout detection' | 198 assert (subdir or '/') == revpath, ('Possible layout detection' |
| 199 ' defect in replay') | 199 ' defect in replay') |
| 200 | 200 |
| 201 # write repository uuid if required | 201 # write repository uuid if required |