Commit 27e77a19 authored by ben's avatar ben

--windows-mode now implies --no-hard-links. DSRPath.path now

correctly initialized from another RPath.


git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup@221 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
parent fe7da6ef
...@@ -150,6 +150,7 @@ def parse_cmdlineoptions(arglist): ...@@ -150,6 +150,7 @@ def parse_cmdlineoptions(arglist):
Globals.set('time_separator', "_") Globals.set('time_separator', "_")
Globals.set('chars_to_quote', "A-Z:") Globals.set('chars_to_quote', "A-Z:")
Globals.set('quoting_enabled', 1) Globals.set('quoting_enabled', 1)
Globals.set('preserve_hardlinks', 0)
select_opts.append(("--exclude-special-files", None)) select_opts.append(("--exclude-special-files", None))
elif opt == '--windows-time-format': elif opt == '--windows-time-format':
Globals.set('time_separator', "_") Globals.set('time_separator', "_")
......
...@@ -54,6 +54,7 @@ class DSRPath(RPath): ...@@ -54,6 +54,7 @@ class DSRPath(RPath):
assert isinstance(conn_or_rp, RPath) assert isinstance(conn_or_rp, RPath)
RPath.__init__(self, conn_or_rp.conn, RPath.__init__(self, conn_or_rp.conn,
conn_or_rp.base, conn_or_rp.index) conn_or_rp.base, conn_or_rp.index)
self.path = conn_or_rp.path # conn_or_rp may be quoted
else: RPath.__init__(self, conn_or_rp, base, index) else: RPath.__init__(self, conn_or_rp, base, index)
if source != "bypass": if source != "bypass":
......
...@@ -197,7 +197,8 @@ class Select: ...@@ -197,7 +197,8 @@ class Select:
if self.quoting_on: if self.quoting_on:
for subdir in FilenameMapping.get_quoted_dir_children(dsrpath): for subdir in FilenameMapping.get_quoted_dir_children(dsrpath):
for dsrp in rec_func(subdir, rec_func, sel_func): yield dsrp for dsrp in rec_func(subdir, rec_func, sel_func):
yield dsrp
else: else:
for filename in Robust.listrp(dsrpath): for filename in Robust.listrp(dsrpath):
new_dsrp = Robust.check_common_error( new_dsrp = Robust.check_common_error(
......
...@@ -150,6 +150,7 @@ def parse_cmdlineoptions(arglist): ...@@ -150,6 +150,7 @@ def parse_cmdlineoptions(arglist):
Globals.set('time_separator', "_") Globals.set('time_separator', "_")
Globals.set('chars_to_quote', "A-Z:") Globals.set('chars_to_quote', "A-Z:")
Globals.set('quoting_enabled', 1) Globals.set('quoting_enabled', 1)
Globals.set('preserve_hardlinks', 0)
select_opts.append(("--exclude-special-files", None)) select_opts.append(("--exclude-special-files", None))
elif opt == '--windows-time-format': elif opt == '--windows-time-format':
Globals.set('time_separator', "_") Globals.set('time_separator', "_")
......
...@@ -54,6 +54,7 @@ class DSRPath(RPath): ...@@ -54,6 +54,7 @@ class DSRPath(RPath):
assert isinstance(conn_or_rp, RPath) assert isinstance(conn_or_rp, RPath)
RPath.__init__(self, conn_or_rp.conn, RPath.__init__(self, conn_or_rp.conn,
conn_or_rp.base, conn_or_rp.index) conn_or_rp.base, conn_or_rp.index)
self.path = conn_or_rp.path # conn_or_rp may be quoted
else: RPath.__init__(self, conn_or_rp, base, index) else: RPath.__init__(self, conn_or_rp, base, index)
if source != "bypass": if source != "bypass":
......
...@@ -197,7 +197,8 @@ class Select: ...@@ -197,7 +197,8 @@ class Select:
if self.quoting_on: if self.quoting_on:
for subdir in FilenameMapping.get_quoted_dir_children(dsrpath): for subdir in FilenameMapping.get_quoted_dir_children(dsrpath):
for dsrp in rec_func(subdir, rec_func, sel_func): yield dsrp for dsrp in rec_func(subdir, rec_func, sel_func):
yield dsrp
else: else:
for filename in Robust.listrp(dsrpath): for filename in Robust.listrp(dsrpath):
new_dsrp = Robust.check_common_error( new_dsrp = Robust.check_common_error(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment