Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/commands.py @ 3706:0d810798acb1
Use 'bundletype' instead of 'type' to not shadow built-in function.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 22 Nov 2006 22:33:57 +0100 |
| parents | 9c1737a3e254 |
| children | 67f44b825784 |
comparison
equal
deleted
inserted
replaced
| 3705:e9d339d5d2d7 | 3706:0d810798acb1 |
|---|---|
| 1322 try: | 1322 try: |
| 1323 fname = opts["bundle"] | 1323 fname = opts["bundle"] |
| 1324 if fname or not other.local(): | 1324 if fname or not other.local(): |
| 1325 # create a bundle (uncompressed if other repo is not local) | 1325 # create a bundle (uncompressed if other repo is not local) |
| 1326 cg = other.changegroup(incoming, "incoming") | 1326 cg = other.changegroup(incoming, "incoming") |
| 1327 type = other.local() and "HG10BZ" or "HG10UN" | 1327 bundletype = other.local() and "HG10BZ" or "HG10UN" |
| 1328 fname = cleanup = changegroup.writebundle(cg, fname, type) | 1328 fname = cleanup = changegroup.writebundle(cg, fname, bundletype) |
| 1329 # keep written bundle? | 1329 # keep written bundle? |
| 1330 if opts["bundle"]: | 1330 if opts["bundle"]: |
| 1331 cleanup = None | 1331 cleanup = None |
| 1332 if not other.local(): | 1332 if not other.local(): |
| 1333 # use the created uncompressed bundlerepo | 1333 # use the created uncompressed bundlerepo |