[SCM] The rsync repository. - branch master updated
The branch, master has been updated via 7a929577 Change r'%s' to r'\g<1>%s'. from f7746d00 A couple extra function checks for future features. https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log - commit 7a9295778cc5c4d666103079c6e8ebfc1d0646ef Author: Wayne Davison Date: Wed May 6 17:23:17 2020 -0700 Change r'\1%s\2' to r'\g<1>%s\2'. --- Summary of changes: packaging/nightly-rsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync index 3e8895b9..eb747432 100755 --- a/packaging/nightly-rsync +++ b/packaging/nightly-rsync @@ -80,7 +80,7 @@ def main(): with open(fn, 'r', encoding='utf-8') as fh: txt = fh.read() -txt = re.sub(r'^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)', r'\1%s\2' % today, txt, flags=re.M) +txt = re.sub(r'^(manpage\([^)]+\)\(\d+\)\()[^)]+(\).*)', r'\g<1>%s\2' % today, txt, flags=re.M) with open(yo_tmp, 'w', encoding='utf-8') as fh: fh.write(txt) -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[Bug 14371] New: Combined Exclude & Protect Filter Type
https://bugzilla.samba.org/show_bug.cgi?id=14371 Bug ID: 14371 Summary: Combined Exclude & Protect Filter Type Product: rsync Version: 3.2.0 Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 Component: core Assignee: wa...@opencoder.net Reporter: sa...@haravikk.com QA Contact: rsync...@samba.org This proposal is for a new filter rule that combines an exclude and a protect rule into a single line. REASONING When using rsync to perform backups, it can be possible to optimise performance by identifying in advance on the sending side any directories that haven't changed. For example, when rsync'ing from a macOS Time Machine backup, if you can compare against a previous backup you've already rsync'd across then it's a simple case of checking directory inodes, any directory whose inode matches the same directory in the previous backup is completely unchanged, and so can be skipped completely by rsync (no need to check it or its contents). To do this, I generate a filter list with lines that look like the following: - /path/to/unchanged/directory/ P /path/to/unchanged/directory/ - /path/to/another/unchanged/directory/ P /path/to/another/unchanged/directory/ This tells rsync to exclude the unchanged directories, but to not exclude them (when --delete-excluded is present, as it should be when taking backup snapshots). Now this works great, the "problem" is that it requires two lines per entry to do what is a very useful trick, so what I would like to see is the addition of a combined option to do this. For example S for skip, so that I can do in a single line what I'm currently doing in two (resulting in a filter list that's twice the size it needs to be). Alternatively, this could be added as an option for either the exclude or protect rule. So the possible syntaxes would be: S /foo/bar/bazSkip /foo/bar/baz -,P /foo/bar/baz Exclude /foo/bar/baz and protect from deletion P,S /foo/bar/baz Protect /foo/bar/baz from deletion and skip checking it I prefer the first as it feels enough like a distinct operation to potentially warrant its own rule, but I'd be fine with either of the others. -,P is perhaps the most logical (allows the P rule as part of an exclude rule)? -- You are receiving this mail because: You are the QA Contact for the bug. -- Please use reply-all for most replies to avoid omitting the mailing list. To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
Re: How to diff two directories?
On 5/6/20 11:49 AM, Peng Yu wrote: > On 5/5/20, Kevin Korb via rsync wrote: >> Rsync != diff. > > What do you mean? I only need to know what files are not the same, but > I don't need to know what the differences are with the files. See diff -q > >> However, if that command lists a file something is different about it. >> add --itemize-changes to find out what. > > I see this output. What does ">f.s 2.txt" mean? Thanks. There is a whole section in the man page that explains what all of the itemize output means. This means the file size is different. > > $ rsync -avun --delete --itemize-changes /tmp/tmp.GH6z0oN8rn/a/ > /tmp/tmp.GH6z0oN8rn/b > sending incremental file list >> f.s 2.txt > > sent 73 bytes received 19 bytes 184.00 bytes/sec > total size is 4 speedup is 0.04 (DRY RUN) > > > ==> /tmp/tmp.GH6z0oN8rn/a/1.txt <== > 1 > > ==> /tmp/tmp.GH6z0oN8rn/a/2.txt <== > 2 > > ==> /tmp/tmp.GH6z0oN8rn/b/1.txt <== > 1 > > ==> /tmp/tmp.GH6z0oN8rn/b/2.txt <== > 22 > > -- ~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._., Kevin Korb Phone:(407) 252-6853 Systems Administrator Internet: FutureQuest, Inc. ke...@futurequest.net (work) Orlando, Floridak...@sanitarium.net (personal) Web page: https://sanitarium.net/ PGP public key available on web site. ~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._.,-*~'`^`'~*-,._., signature.asc Description: OpenPGP digital signature -- Please use reply-all for most replies to avoid omitting the mailing list. To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
Re: How to diff two directories?
On 5/5/20, Kevin Korb via rsync wrote: > Rsync != diff. What do you mean? I only need to know what files are not the same, but I don't need to know what the differences are with the files. > However, if that command lists a file something is different about it. > add --itemize-changes to find out what. I see this output. What does ">f.s 2.txt" mean? Thanks. $ rsync -avun --delete --itemize-changes /tmp/tmp.GH6z0oN8rn/a/ /tmp/tmp.GH6z0oN8rn/b sending incremental file list >f.s 2.txt sent 73 bytes received 19 bytes 184.00 bytes/sec total size is 4 speedup is 0.04 (DRY RUN) ==> /tmp/tmp.GH6z0oN8rn/a/1.txt <== 1 ==> /tmp/tmp.GH6z0oN8rn/a/2.txt <== 2 ==> /tmp/tmp.GH6z0oN8rn/b/1.txt <== 1 ==> /tmp/tmp.GH6z0oN8rn/b/2.txt <== 22 -- Regards, Peng -- Please use reply-all for most replies to avoid omitting the mailing list. To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html
