core-3nweb-client-lib 0.44.1 → 0.44.3

package/build/protos/asmail.proto.js

@@ -34290,9 +34290,9 @@ $root.fs = (function() {
          * @property {file.ITimeStampsDiff|null} [ctime] FolderDiff ctime
          * @property {file.ITimeStampsDiff|null} [mtime] FolderDiff mtime
          * @property {Array.<file.IXAttrDiff>|null} [xattrs] FolderDiff xattrs
-         * @property {Array.<fs.FolderDiff.IRemoved>|null} [removed] FolderDiff removed
+         * @property {fs.FolderDiff.IItemsByBranches|null} [removed] FolderDiff removed
          * @property {Array.<fs.FolderDiff.IRenamed>|null} [renamed] FolderDiff renamed
-         * @property {Array.<fs.FolderDiff.IAdded>|null} [added] FolderDiff added
+         * @property {fs.FolderDiff.IItemsByBranches|null} [added] FolderDiff added
          * @property {Array.<fs.FolderDiff.IRekeyed>|null} [rekeyed] FolderDiff rekeyed
          * @property {Array.<string>|null} [nameOverlaps] FolderDiff nameOverlaps
          */
@@ -34307,9 +34307,7 @@ $root.fs = (function() {
          */
         function FolderDiff(properties) {
             this.xattrs = [];
-            this.removed = [];
             this.renamed = [];
-            this.added = [];
             this.rekeyed = [];
             this.nameOverlaps = [];
             if (properties)
@@ -34384,11 +34382,11 @@ $root.fs = (function() {
 
         /**
          * FolderDiff removed.
-         * @member {Array.<fs.FolderDiff.IRemoved>} removed
+         * @member {fs.FolderDiff.IItemsByBranches|null|undefined} removed
          * @memberof fs.FolderDiff
          * @instance
          */
-        FolderDiff.prototype.removed = $util.emptyArray;
+        FolderDiff.prototype.removed = null;
 
         /**
          * FolderDiff renamed.
@@ -34400,11 +34398,11 @@ $root.fs = (function() {
 
         /**
          * FolderDiff added.
-         * @member {Array.<fs.FolderDiff.IAdded>} added
+         * @member {fs.FolderDiff.IItemsByBranches|null|undefined} added
          * @memberof fs.FolderDiff
          * @instance
          */
-        FolderDiff.prototype.added = $util.emptyArray;
+        FolderDiff.prototype.added = null;
 
         /**
          * FolderDiff rekeyed.
@@ -34463,15 +34461,13 @@ $root.fs = (function() {
             if (message.xattrs != null && message.xattrs.length)
                 for (var i = 0; i < message.xattrs.length; ++i)
                     $root.file.XAttrDiff.encode(message.xattrs[i], writer.uint32(/* id 8, wireType 2 =*/66).fork()).ldelim();
-            if (message.removed != null && message.removed.length)
-                for (var i = 0; i < message.removed.length; ++i)
-                    $root.fs.FolderDiff.Removed.encode(message.removed[i], writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
+            if (message.removed != null && Object.hasOwnProperty.call(message, "removed"))
+                $root.fs.FolderDiff.ItemsByBranches.encode(message.removed, writer.uint32(/* id 11, wireType 2 =*/90).fork()).ldelim();
             if (message.renamed != null && message.renamed.length)
                 for (var i = 0; i < message.renamed.length; ++i)
                     $root.fs.FolderDiff.Renamed.encode(message.renamed[i], writer.uint32(/* id 12, wireType 2 =*/98).fork()).ldelim();
-            if (message.added != null && message.added.length)
-                for (var i = 0; i < message.added.length; ++i)
-                    $root.fs.FolderDiff.Added.encode(message.added[i], writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim();
+            if (message.added != null && Object.hasOwnProperty.call(message, "added"))
+                $root.fs.FolderDiff.ItemsByBranches.encode(message.added, writer.uint32(/* id 13, wireType 2 =*/106).fork()).ldelim();
             if (message.rekeyed != null && message.rekeyed.length)
                 for (var i = 0; i < message.rekeyed.length; ++i)
                     $root.fs.FolderDiff.Rekeyed.encode(message.rekeyed[i], writer.uint32(/* id 14, wireType 2 =*/114).fork()).ldelim();
@@ -34549,9 +34545,7 @@ $root.fs = (function() {
                         break;
                     }
                 case 11: {
-                        if (!(message.removed && message.removed.length))
-                            message.removed = [];
-                        message.removed.push($root.fs.FolderDiff.Removed.decode(reader, reader.uint32()));
+                        message.removed = $root.fs.FolderDiff.ItemsByBranches.decode(reader, reader.uint32());
                         break;
                     }
                 case 12: {
@@ -34561,9 +34555,7 @@ $root.fs = (function() {
                         break;
                     }
                 case 13: {
-                        if (!(message.added && message.added.length))
-                            message.added = [];
-                        message.added.push($root.fs.FolderDiff.Added.decode(reader, reader.uint32()));
+                        message.added = $root.fs.FolderDiff.ItemsByBranches.decode(reader, reader.uint32());
                         break;
                     }
                 case 14: {
@@ -34652,13 +34644,9 @@ $root.fs = (function() {
                 }
             }
             if (message.removed != null && message.hasOwnProperty("removed")) {
-                if (!Array.isArray(message.removed))
-                    return "removed: array expected";
-                for (var i = 0; i < message.removed.length; ++i) {
-                    var error = $root.fs.FolderDiff.Removed.verify(message.removed[i]);
-                    if (error)
-                        return "removed." + error;
-                }
+                var error = $root.fs.FolderDiff.ItemsByBranches.verify(message.removed);
+                if (error)
+                    return "removed." + error;
             }
             if (message.renamed != null && message.hasOwnProperty("renamed")) {
                 if (!Array.isArray(message.renamed))
@@ -34670,13 +34658,9 @@ $root.fs = (function() {
                 }
             }
             if (message.added != null && message.hasOwnProperty("added")) {
-                if (!Array.isArray(message.added))
-                    return "added: array expected";
-                for (var i = 0; i < message.added.length; ++i) {
-                    var error = $root.fs.FolderDiff.Added.verify(message.added[i]);
-                    if (error)
-                        return "added." + error;
-                }
+                var error = $root.fs.FolderDiff.ItemsByBranches.verify(message.added);
+                if (error)
+                    return "added." + error;
             }
             if (message.rekeyed != null && message.hasOwnProperty("rekeyed")) {
                 if (!Array.isArray(message.rekeyed))
@@ -34752,15 +34736,10 @@ $root.fs = (function() {
                     message.xattrs[i] = $root.file.XAttrDiff.fromObject(object.xattrs[i]);
                 }
             }
-            if (object.removed) {
-                if (!Array.isArray(object.removed))
-                    throw TypeError(".fs.FolderDiff.removed: array expected");
-                message.removed = [];
-                for (var i = 0; i < object.removed.length; ++i) {
-                    if (typeof object.removed[i] !== "object")
-                        throw TypeError(".fs.FolderDiff.removed: object expected");
-                    message.removed[i] = $root.fs.FolderDiff.Removed.fromObject(object.removed[i]);
-                }
+            if (object.removed != null) {
+                if (typeof object.removed !== "object")
+                    throw TypeError(".fs.FolderDiff.removed: object expected");
+                message.removed = $root.fs.FolderDiff.ItemsByBranches.fromObject(object.removed);
             }
             if (object.renamed) {
                 if (!Array.isArray(object.renamed))
@@ -34772,15 +34751,10 @@ $root.fs = (function() {
                     message.renamed[i] = $root.fs.FolderDiff.Renamed.fromObject(object.renamed[i]);
                 }
             }
-            if (object.added) {
-                if (!Array.isArray(object.added))
-                    throw TypeError(".fs.FolderDiff.added: array expected");
-                message.added = [];
-                for (var i = 0; i < object.added.length; ++i) {
-                    if (typeof object.added[i] !== "object")
-                        throw TypeError(".fs.FolderDiff.added: object expected");
-                    message.added[i] = $root.fs.FolderDiff.Added.fromObject(object.added[i]);
-                }
+            if (object.added != null) {
+                if (typeof object.added !== "object")
+                    throw TypeError(".fs.FolderDiff.added: object expected");
+                message.added = $root.fs.FolderDiff.ItemsByBranches.fromObject(object.added);
             }
             if (object.rekeyed) {
                 if (!Array.isArray(object.rekeyed))
@@ -34817,9 +34791,7 @@ $root.fs = (function() {
             var object = {};
             if (options.arrays || options.defaults) {
                 object.xattrs = [];
-                object.removed = [];
                 object.renamed = [];
-                object.added = [];
                 object.rekeyed = [];
                 object.nameOverlaps = [];
             }
@@ -34835,6 +34807,8 @@ $root.fs = (function() {
                 object.isRemoteRemoved = false;
                 object.ctime = null;
                 object.mtime = null;
+                object.removed = null;
+                object.added = null;
             }
             if (message.currentVersion != null && message.hasOwnProperty("currentVersion"))
                 if (typeof message.currentVersion === "number")
@@ -34858,21 +34832,15 @@ $root.fs = (function() {
                 for (var j = 0; j < message.xattrs.length; ++j)
                     object.xattrs[j] = $root.file.XAttrDiff.toObject(message.xattrs[j], options);
             }
-            if (message.removed && message.removed.length) {
-                object.removed = [];
-                for (var j = 0; j < message.removed.length; ++j)
-                    object.removed[j] = $root.fs.FolderDiff.Removed.toObject(message.removed[j], options);
-            }
+            if (message.removed != null && message.hasOwnProperty("removed"))
+                object.removed = $root.fs.FolderDiff.ItemsByBranches.toObject(message.removed, options);
             if (message.renamed && message.renamed.length) {
                 object.renamed = [];
                 for (var j = 0; j < message.renamed.length; ++j)
                     object.renamed[j] = $root.fs.FolderDiff.Renamed.toObject(message.renamed[j], options);
             }
-            if (message.added && message.added.length) {
-                object.added = [];
-                for (var j = 0; j < message.added.length; ++j)
-                    object.added[j] = $root.fs.FolderDiff.Added.toObject(message.added[j], options);
-            }
+            if (message.added != null && message.hasOwnProperty("added"))
+                object.added = $root.fs.FolderDiff.ItemsByBranches.toObject(message.added, options);
             if (message.rekeyed && message.rekeyed.length) {
                 object.rekeyed = [];
                 for (var j = 0; j < message.rekeyed.length; ++j)
@@ -34912,25 +34880,27 @@ $root.fs = (function() {
             return typeUrlPrefix + "/fs.FolderDiff";
         };
 
-        FolderDiff.Removed = (function() {
+        FolderDiff.ItemsByBranches = (function() {
 
             /**
-             * Properties of a Removed.
+             * Properties of an ItemsByBranches.
              * @memberof fs.FolderDiff
-             * @interface IRemoved
-             * @property {string|null} [name] Removed name
-             * @property {string|null} [removedIn] Removed removedIn
+             * @interface IItemsByBranches
+             * @property {Array.<string>|null} [inLocal] ItemsByBranches inLocal
+             * @property {Array.<string>|null} [inRemote] ItemsByBranches inRemote
              */
 
             /**
-             * Constructs a new Removed.
+             * Constructs a new ItemsByBranches.
              * @memberof fs.FolderDiff
-             * @classdesc Represents a Removed.
-             * @implements IRemoved
+             * @classdesc Represents an ItemsByBranches.
+             * @implements IItemsByBranches
              * @constructor
-             * @param {fs.FolderDiff.IRemoved=} [properties] Properties to set
+             * @param {fs.FolderDiff.IItemsByBranches=} [properties] Properties to set
              */
-            function Removed(properties) {
+            function ItemsByBranches(properties) {
+                this.inLocal = [];
+                this.inRemote = [];
                 if (properties)
                     for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
                         if (properties[keys[i]] != null)
@@ -34938,91 +34908,97 @@ $root.fs = (function() {
             }
 
             /**
-             * Removed name.
-             * @member {string} name
-             * @memberof fs.FolderDiff.Removed
+             * ItemsByBranches inLocal.
+             * @member {Array.<string>} inLocal
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @instance
              */
-            Removed.prototype.name = "";
+            ItemsByBranches.prototype.inLocal = $util.emptyArray;
 
             /**
-             * Removed removedIn.
-             * @member {string} removedIn
-             * @memberof fs.FolderDiff.Removed
+             * ItemsByBranches inRemote.
+             * @member {Array.<string>} inRemote
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @instance
              */
-            Removed.prototype.removedIn = "";
+            ItemsByBranches.prototype.inRemote = $util.emptyArray;
 
             /**
-             * Creates a new Removed instance using the specified properties.
+             * Creates a new ItemsByBranches instance using the specified properties.
              * @function create
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
-             * @param {fs.FolderDiff.IRemoved=} [properties] Properties to set
-             * @returns {fs.FolderDiff.Removed} Removed instance
+             * @param {fs.FolderDiff.IItemsByBranches=} [properties] Properties to set
+             * @returns {fs.FolderDiff.ItemsByBranches} ItemsByBranches instance
              */
-            Removed.create = function create(properties) {
-                return new Removed(properties);
+            ItemsByBranches.create = function create(properties) {
+                return new ItemsByBranches(properties);
             };
 
             /**
-             * Encodes the specified Removed message. Does not implicitly {@link fs.FolderDiff.Removed.verify|verify} messages.
+             * Encodes the specified ItemsByBranches message. Does not implicitly {@link fs.FolderDiff.ItemsByBranches.verify|verify} messages.
              * @function encode
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
-             * @param {fs.FolderDiff.IRemoved} message Removed message or plain object to encode
+             * @param {fs.FolderDiff.IItemsByBranches} message ItemsByBranches message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
-            Removed.encode = function encode(message, writer) {
+            ItemsByBranches.encode = function encode(message, writer) {
                 if (!writer)
                     writer = $Writer.create();
-                if (message.name != null && Object.hasOwnProperty.call(message, "name"))
-                    writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
-                if (message.removedIn != null && Object.hasOwnProperty.call(message, "removedIn"))
-                    writer.uint32(/* id 2, wireType 2 =*/18).string(message.removedIn);
+                if (message.inLocal != null && message.inLocal.length)
+                    for (var i = 0; i < message.inLocal.length; ++i)
+                        writer.uint32(/* id 1, wireType 2 =*/10).string(message.inLocal[i]);
+                if (message.inRemote != null && message.inRemote.length)
+                    for (var i = 0; i < message.inRemote.length; ++i)
+                        writer.uint32(/* id 2, wireType 2 =*/18).string(message.inRemote[i]);
                 return writer;
             };
 
             /**
-             * Encodes the specified Removed message, length delimited. Does not implicitly {@link fs.FolderDiff.Removed.verify|verify} messages.
+             * Encodes the specified ItemsByBranches message, length delimited. Does not implicitly {@link fs.FolderDiff.ItemsByBranches.verify|verify} messages.
              * @function encodeDelimited
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
-             * @param {fs.FolderDiff.IRemoved} message Removed message or plain object to encode
+             * @param {fs.FolderDiff.IItemsByBranches} message ItemsByBranches message or plain object to encode
              * @param {$protobuf.Writer} [writer] Writer to encode to
              * @returns {$protobuf.Writer} Writer
              */
-            Removed.encodeDelimited = function encodeDelimited(message, writer) {
+            ItemsByBranches.encodeDelimited = function encodeDelimited(message, writer) {
                 return this.encode(message, writer).ldelim();
             };
 
             /**
-             * Decodes a Removed message from the specified reader or buffer.
+             * Decodes an ItemsByBranches message from the specified reader or buffer.
              * @function decode
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
              * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
              * @param {number} [length] Message length if known beforehand
-             * @returns {fs.FolderDiff.Removed} Removed
+             * @returns {fs.FolderDiff.ItemsByBranches} ItemsByBranches
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Removed.decode = function decode(reader, length, error) {
+            ItemsByBranches.decode = function decode(reader, length, error) {
                 if (!(reader instanceof $Reader))
                     reader = $Reader.create(reader);
-                var end = length === undefined ? reader.len : reader.pos + length, message = new $root.fs.FolderDiff.Removed();
+                var end = length === undefined ? reader.len : reader.pos + length, message = new $root.fs.FolderDiff.ItemsByBranches();
                 while (reader.pos < end) {
                     var tag = reader.uint32();
                     if (tag === error)
                         break;
                     switch (tag >>> 3) {
                     case 1: {
-                            message.name = reader.string();
+                            if (!(message.inLocal && message.inLocal.length))
+                                message.inLocal = [];
+                            message.inLocal.push(reader.string());
                             break;
                         }
                     case 2: {
-                            message.removedIn = reader.string();
+                            if (!(message.inRemote && message.inRemote.length))
+                                message.inRemote = [];
+                            message.inRemote.push(reader.string());
                             break;
                         }
                     default:
@@ -35034,111 +35010,135 @@ $root.fs = (function() {
             };
 
             /**
-             * Decodes a Removed message from the specified reader or buffer, length delimited.
+             * Decodes an ItemsByBranches message from the specified reader or buffer, length delimited.
              * @function decodeDelimited
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
              * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-             * @returns {fs.FolderDiff.Removed} Removed
+             * @returns {fs.FolderDiff.ItemsByBranches} ItemsByBranches
              * @throws {Error} If the payload is not a reader or valid buffer
              * @throws {$protobuf.util.ProtocolError} If required fields are missing
              */
-            Removed.decodeDelimited = function decodeDelimited(reader) {
+            ItemsByBranches.decodeDelimited = function decodeDelimited(reader) {
                 if (!(reader instanceof $Reader))
                     reader = new $Reader(reader);
                 return this.decode(reader, reader.uint32());
             };
 
             /**
-             * Verifies a Removed message.
+             * Verifies an ItemsByBranches message.
              * @function verify
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
              * @param {Object.<string,*>} message Plain object to verify
              * @returns {string|null} `null` if valid, otherwise the reason why it is not
              */
-            Removed.verify = function verify(message) {
+            ItemsByBranches.verify = function verify(message) {
                 if (typeof message !== "object" || message === null)
                     return "object expected";
-                if (message.name != null && message.hasOwnProperty("name"))
-                    if (!$util.isString(message.name))
-                        return "name: string expected";
-                if (message.removedIn != null && message.hasOwnProperty("removedIn"))
-                    if (!$util.isString(message.removedIn))
-                        return "removedIn: string expected";
+                if (message.inLocal != null && message.hasOwnProperty("inLocal")) {
+                    if (!Array.isArray(message.inLocal))
+                        return "inLocal: array expected";
+                    for (var i = 0; i < message.inLocal.length; ++i)
+                        if (!$util.isString(message.inLocal[i]))
+                            return "inLocal: string[] expected";
+                }
+                if (message.inRemote != null && message.hasOwnProperty("inRemote")) {
+                    if (!Array.isArray(message.inRemote))
+                        return "inRemote: array expected";
+                    for (var i = 0; i < message.inRemote.length; ++i)
+                        if (!$util.isString(message.inRemote[i]))
+                            return "inRemote: string[] expected";
+                }
                 return null;
             };
 
             /**
-             * Creates a Removed message from a plain object. Also converts values to their respective internal types.
+             * Creates an ItemsByBranches message from a plain object. Also converts values to their respective internal types.
              * @function fromObject
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
              * @param {Object.<string,*>} object Plain object
-             * @returns {fs.FolderDiff.Removed} Removed
+             * @returns {fs.FolderDiff.ItemsByBranches} ItemsByBranches
              */
-            Removed.fromObject = function fromObject(object) {
-                if (object instanceof $root.fs.FolderDiff.Removed)
+            ItemsByBranches.fromObject = function fromObject(object) {
+                if (object instanceof $root.fs.FolderDiff.ItemsByBranches)
                     return object;
-                var message = new $root.fs.FolderDiff.Removed();
-                if (object.name != null)
-                    message.name = String(object.name);
-                if (object.removedIn != null)
-                    message.removedIn = String(object.removedIn);
+                var message = new $root.fs.FolderDiff.ItemsByBranches();
+                if (object.inLocal) {
+                    if (!Array.isArray(object.inLocal))
+                        throw TypeError(".fs.FolderDiff.ItemsByBranches.inLocal: array expected");
+                    message.inLocal = [];
+                    for (var i = 0; i < object.inLocal.length; ++i)
+                        message.inLocal[i] = String(object.inLocal[i]);
+                }
+                if (object.inRemote) {
+                    if (!Array.isArray(object.inRemote))
+                        throw TypeError(".fs.FolderDiff.ItemsByBranches.inRemote: array expected");
+                    message.inRemote = [];
+                    for (var i = 0; i < object.inRemote.length; ++i)
+                        message.inRemote[i] = String(object.inRemote[i]);
+                }
                 return message;
             };
 
             /**
-             * Creates a plain object from a Removed message. Also converts values to other types if specified.
+             * Creates a plain object from an ItemsByBranches message. Also converts values to other types if specified.
              * @function toObject
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
-             * @param {fs.FolderDiff.Removed} message Removed
+             * @param {fs.FolderDiff.ItemsByBranches} message ItemsByBranches
              * @param {$protobuf.IConversionOptions} [options] Conversion options
              * @returns {Object.<string,*>} Plain object
              */
-            Removed.toObject = function toObject(message, options) {
+            ItemsByBranches.toObject = function toObject(message, options) {
                 if (!options)
                     options = {};
                 var object = {};
-                if (options.defaults) {
-                    object.name = "";
-                    object.removedIn = "";
+                if (options.arrays || options.defaults) {
+                    object.inLocal = [];
+                    object.inRemote = [];
+                }
+                if (message.inLocal && message.inLocal.length) {
+                    object.inLocal = [];
+                    for (var j = 0; j < message.inLocal.length; ++j)
+                        object.inLocal[j] = message.inLocal[j];
+                }
+                if (message.inRemote && message.inRemote.length) {
+                    object.inRemote = [];
+                    for (var j = 0; j < message.inRemote.length; ++j)
+                        object.inRemote[j] = message.inRemote[j];
                 }
-                if (message.name != null && message.hasOwnProperty("name"))
-                    object.name = message.name;
-                if (message.removedIn != null && message.hasOwnProperty("removedIn"))
-                    object.removedIn = message.removedIn;
                 return object;
             };
 
             /**
-             * Converts this Removed to JSON.
+             * Converts this ItemsByBranches to JSON.
              * @function toJSON
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @instance
              * @returns {Object.<string,*>} JSON object
              */
-            Removed.prototype.toJSON = function toJSON() {
+            ItemsByBranches.prototype.toJSON = function toJSON() {
                 return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
             };
 
             /**
-             * Gets the default type url for Removed
+             * Gets the default type url for ItemsByBranches
              * @function getTypeUrl
-             * @memberof fs.FolderDiff.Removed
+             * @memberof fs.FolderDiff.ItemsByBranches
              * @static
              * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
              * @returns {string} The default type url
              */
-            Removed.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
+            ItemsByBranches.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
                 if (typeUrlPrefix === undefined) {
                     typeUrlPrefix = "type.googleapis.com";
                 }
-                return typeUrlPrefix + "/fs.FolderDiff.Removed";
+                return typeUrlPrefix + "/fs.FolderDiff.ItemsByBranches";
             };
 
-            return Removed;
+            return ItemsByBranches;
         })();
 
         FolderDiff.Renamed = (function() {
@@ -35393,235 +35393,6 @@ $root.fs = (function() {
             return Renamed;
         })();
 
-        FolderDiff.Added = (function() {
-
-            /**
-             * Properties of an Added.
-             * @memberof fs.FolderDiff
-             * @interface IAdded
-             * @property {string|null} [name] Added name
-             * @property {string|null} [addedIn] Added addedIn
-             */
-
-            /**
-             * Constructs a new Added.
-             * @memberof fs.FolderDiff
-             * @classdesc Represents an Added.
-             * @implements IAdded
-             * @constructor
-             * @param {fs.FolderDiff.IAdded=} [properties] Properties to set
-             */
-            function Added(properties) {
-                if (properties)
-                    for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                        if (properties[keys[i]] != null)
-                            this[keys[i]] = properties[keys[i]];
-            }
-
-            /**
-             * Added name.
-             * @member {string} name
-             * @memberof fs.FolderDiff.Added
-             * @instance
-             */
-            Added.prototype.name = "";
-
-            /**
-             * Added addedIn.
-             * @member {string} addedIn
-             * @memberof fs.FolderDiff.Added
-             * @instance
-             */
-            Added.prototype.addedIn = "";
-
-            /**
-             * Creates a new Added instance using the specified properties.
-             * @function create
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {fs.FolderDiff.IAdded=} [properties] Properties to set
-             * @returns {fs.FolderDiff.Added} Added instance
-             */
-            Added.create = function create(properties) {
-                return new Added(properties);
-            };
-
-            /**
-             * Encodes the specified Added message. Does not implicitly {@link fs.FolderDiff.Added.verify|verify} messages.
-             * @function encode
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {fs.FolderDiff.IAdded} message Added message or plain object to encode
-             * @param {$protobuf.Writer} [writer] Writer to encode to
-             * @returns {$protobuf.Writer} Writer
-             */
-            Added.encode = function encode(message, writer) {
-                if (!writer)
-                    writer = $Writer.create();
-                if (message.name != null && Object.hasOwnProperty.call(message, "name"))
-                    writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
-                if (message.addedIn != null && Object.hasOwnProperty.call(message, "addedIn"))
-                    writer.uint32(/* id 2, wireType 2 =*/18).string(message.addedIn);
-                return writer;
-            };
-
-            /**
-             * Encodes the specified Added message, length delimited. Does not implicitly {@link fs.FolderDiff.Added.verify|verify} messages.
-             * @function encodeDelimited
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {fs.FolderDiff.IAdded} message Added message or plain object to encode
-             * @param {$protobuf.Writer} [writer] Writer to encode to
-             * @returns {$protobuf.Writer} Writer
-             */
-            Added.encodeDelimited = function encodeDelimited(message, writer) {
-                return this.encode(message, writer).ldelim();
-            };
-
-            /**
-             * Decodes an Added message from the specified reader or buffer.
-             * @function decode
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-             * @param {number} [length] Message length if known beforehand
-             * @returns {fs.FolderDiff.Added} Added
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
-            Added.decode = function decode(reader, length, error) {
-                if (!(reader instanceof $Reader))
-                    reader = $Reader.create(reader);
-                var end = length === undefined ? reader.len : reader.pos + length, message = new $root.fs.FolderDiff.Added();
-                while (reader.pos < end) {
-                    var tag = reader.uint32();
-                    if (tag === error)
-                        break;
-                    switch (tag >>> 3) {
-                    case 1: {
-                            message.name = reader.string();
-                            break;
-                        }
-                    case 2: {
-                            message.addedIn = reader.string();
-                            break;
-                        }
-                    default:
-                        reader.skipType(tag & 7);
-                        break;
-                    }
-                }
-                return message;
-            };
-
-            /**
-             * Decodes an Added message from the specified reader or buffer, length delimited.
-             * @function decodeDelimited
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-             * @returns {fs.FolderDiff.Added} Added
-             * @throws {Error} If the payload is not a reader or valid buffer
-             * @throws {$protobuf.util.ProtocolError} If required fields are missing
-             */
-            Added.decodeDelimited = function decodeDelimited(reader) {
-                if (!(reader instanceof $Reader))
-                    reader = new $Reader(reader);
-                return this.decode(reader, reader.uint32());
-            };
-
-            /**
-             * Verifies an Added message.
-             * @function verify
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {Object.<string,*>} message Plain object to verify
-             * @returns {string|null} `null` if valid, otherwise the reason why it is not
-             */
-            Added.verify = function verify(message) {
-                if (typeof message !== "object" || message === null)
-                    return "object expected";
-                if (message.name != null && message.hasOwnProperty("name"))
-                    if (!$util.isString(message.name))
-                        return "name: string expected";
-                if (message.addedIn != null && message.hasOwnProperty("addedIn"))
-                    if (!$util.isString(message.addedIn))
-                        return "addedIn: string expected";
-                return null;
-            };
-
-            /**
-             * Creates an Added message from a plain object. Also converts values to their respective internal types.
-             * @function fromObject
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {Object.<string,*>} object Plain object
-             * @returns {fs.FolderDiff.Added} Added
-             */
-            Added.fromObject = function fromObject(object) {
-                if (object instanceof $root.fs.FolderDiff.Added)
-                    return object;
-                var message = new $root.fs.FolderDiff.Added();
-                if (object.name != null)
-                    message.name = String(object.name);
-                if (object.addedIn != null)
-                    message.addedIn = String(object.addedIn);
-                return message;
-            };
-
-            /**
-             * Creates a plain object from an Added message. Also converts values to other types if specified.
-             * @function toObject
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {fs.FolderDiff.Added} message Added
-             * @param {$protobuf.IConversionOptions} [options] Conversion options
-             * @returns {Object.<string,*>} Plain object
-             */
-            Added.toObject = function toObject(message, options) {
-                if (!options)
-                    options = {};
-                var object = {};
-                if (options.defaults) {
-                    object.name = "";
-                    object.addedIn = "";
-                }
-                if (message.name != null && message.hasOwnProperty("name"))
-                    object.name = message.name;
-                if (message.addedIn != null && message.hasOwnProperty("addedIn"))
-                    object.addedIn = message.addedIn;
-                return object;
-            };
-
-            /**
-             * Converts this Added to JSON.
-             * @function toJSON
-             * @memberof fs.FolderDiff.Added
-             * @instance
-             * @returns {Object.<string,*>} JSON object
-             */
-            Added.prototype.toJSON = function toJSON() {
-                return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-            };
-
-            /**
-             * Gets the default type url for Added
-             * @function getTypeUrl
-             * @memberof fs.FolderDiff.Added
-             * @static
-             * @param {string} [typeUrlPrefix] your custom typeUrlPrefix(default "type.googleapis.com")
-             * @returns {string} The default type url
-             */
-            Added.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
-                if (typeUrlPrefix === undefined) {
-                    typeUrlPrefix = "type.googleapis.com";
-                }
-                return typeUrlPrefix + "/fs.FolderDiff.Added";
-            };
-
-            return Added;
-        })();
-
         FolderDiff.Rekeyed = (function() {
 
             /**